Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 22 Jan 2009 21:49:30 +0000 (22:49 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 22 Jan 2009 21:49:30 +0000 (22:49 +0100)

Trivial merge