Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 1 Nov 2008 02:15:59 +0000 (03:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 1 Nov 2008 02:15:59 +0000 (03:15 +0100)

Trivial merge