Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 15:12:16 +0000 (17:12 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 15:12:16 +0000 (17:12 +0200)

Trivial merge