Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 10 Jun 2008 03:19:56 +0000 (13:19 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 10 Jun 2008 03:19:56 +0000 (13:19 +1000)
commit7721ea8f9c75d304111935048167dd27525cc91a
treefdc6563d085003cf6fe003748fb85291166a5454
parent7974ccbebf5c684200850a726d79b976eaeea261
parent1384f836b601d35f3c499a9e26c3e3b0d12b3ad0
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 1d52d9cc70158dbe30325220aa5c1e6203c8b72b)