Merge branch 'v4-0-test' into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 17:59:03 +0000 (18:59 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 17:59:03 +0000 (18:59 +0100)
(This used to be commit 2bf43c7932d886b0db3e1c2f5a4b8697435b0c5c)


Trivial merge