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)
commitba4739547ef9bf2eb4aac45be9d71264a845e4fc
tree796aa806a662230e09deee4b4bbc1ac0cae062db
parent8f8c56bfbcbfe8f80afb09eb1d481a108b252bee
parent52013b846a7b97022b8368b51734e7a960e704f4
Merge branch 'v4-0-test' of git://git.samba.org/samba into v4-0-local
(This used to be commit 9b4449b46c0404b3c694ac9c592be63185c366b7)