Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
commit6bb4c1e6a38a842787177a399bf88f05015f5ec0
authorAndrew Bartlett <abartlet@samba.org>
Thu, 1 May 2008 06:41:36 +0000 (1 16:41 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 1 May 2008 06:41:36 +0000 (1 16:41 +1000)
treef98fab4a2a5eb088ff8692457d11193d19448330
parent71ec5bfb3e973bd68649a598d006efcdda18f1b6
parent38f455e0054acc1fdaea267e03f8aad337309cf2
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet