Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sun, 24 Aug 2008 22:27:06 +0000 (08:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 24 Aug 2008 22:27:06 +0000 (08:27 +1000)
commit9eacc3a8f396e74b0deed193f0f2ecffa3ba8e93
tree28d045a42a9b09b42e34b9009a6635026ff3d9c8
parent5631ebaf78fee35880aafe29578b8925c655e5f4
parenta22b9d648553e5e7e0ee19606d9bceeb3b356241
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit a555334db67527b57bc6172e3d08f65caf1e6760)