Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 01:49:43 +0000 (02:49 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 01:49:43 +0000 (02:49 +0100)

Trivial merge