Merge branch 'master' of git://git.samba.org/samba into minschema
authorJelmer Vernooij <jelmer@samba.org>
Fri, 20 Mar 2009 00:30:36 +0000 (01:30 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 20 Mar 2009 00:30:36 +0000 (01:30 +0100)

Trivial merge