Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:10:49 +0000 (19:10 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:10:49 +0000 (19:10 +0200)
(This used to be commit 201da6d5d05ed624bd9f4bd535969077a3b8b3ba)


Trivial merge