Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 2 Jul 2008 11:47:21 +0000 (21:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 2 Jul 2008 11:47:21 +0000 (21:47 +1000)
commitb4b303b5ce172173a138865e6a69c0f039c833b4
tree1c7b1155c95751d580c4d87d1ca34b4e13f9eeb6
parent7e851ada55bcdbd1ad19587e5dd6779c74c361e1
parent0a391223acc78c7338fe3a38b61742f3cb67b551
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit b4e7063058ac8587c526dd9133aee345e99f8ef8)