Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jul 2008 08:07:51 +0000 (18:07 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 10 Jul 2008 08:07:51 +0000 (18:07 +1000)
commitf956908cde7dd40643ff49cf433d0cf7765027de
tree3117fb56fa2be80e1584ae0fd4814cd8d12cfdc5
parent5ab20aa8b43415751f77602fff3a3008bf2186db
parentaa27344b96929c925b30965a1cd20e69c3dbd515
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local