Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Fri, 28 Mar 2008 00:00:13 +0000 (01:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 28 Mar 2008 00:00:13 +0000 (01:00 +0100)
(This used to be commit 71110c8e7d58f42312938d0a8d0b216cbc313885)


Trivial merge