Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 30 Oct 2008 22:29:14 +0000 (23:29 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 30 Oct 2008 22:29:14 +0000 (23:29 +0100)

Trivial merge