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

Trivial merge