Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 6 Feb 2008 05:14:09 +0000 (16:14 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 6 Feb 2008 05:14:09 +0000 (16:14 +1100)
commit07c8cdec4767731a278d5c73a4ebaceeaced5288
tree9b0e3aefe7ac54f1821a6348f041d6462dce909a
parent24d0587752ca81ac9e35c6c4dbcadb87455f5ded
parentc9ea65e4ced86d26dfa8c1c540a57dc633b217ba
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 594ff923295c7420167aa899ec6030de07038625)