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

Trivial merge