Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 00:54:39 +0000 (02:54 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 00:54:39 +0000 (02:54 +0200)

Trivial merge