Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 20:15:59 +0000 (21:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 20:15:59 +0000 (21:15 +0100)

Trivial merge