Merge branch 'v4-0-test' of git://git.samba.org/samba into v4-0-local
authorAndrew Kroeger <andrew@sprocks.gotdns.com>
Fri, 28 Mar 2008 10:43:52 +0000 (05:43 -0500)
committerAndrew Kroeger <andrew@sprocks.gotdns.com>
Fri, 28 Mar 2008 10:43:52 +0000 (05:43 -0500)
(This used to be commit 9b4449b46c0404b3c694ac9c592be63185c366b7)


Trivial merge