Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 26 Mar 2009 14:31:02 +0000 (15:31 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 26 Mar 2009 14:31:02 +0000 (15:31 +0100)

Trivial merge