Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 24 Mar 2008 23:29:35 +0000 (10:29 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 24 Mar 2008 23:29:35 +0000 (10:29 +1100)
commit2d08a03c50d065ed5175b37cb26b2794efde3c7b
tree5e2570cb23c1e29a1693d3ebfaafb952bee8af05
parent89870f2d9a7296b51d53934450ea5253a66145e5
parent482f33077b965bab7f6ccb82cee03b66d70c57b7
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 3903ef9168a18d34517c78536d34e147a9bc01cd)