Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 13:26:26 +0000 (15:26 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 13:26:26 +0000 (15:26 +0200)
commit5a73810e127b7d0af531e2bd0c0a4964878c866b
tree5e226147f50b1329545b1c1c58ad984637adfd71
parenta96bba21fa99d7057f001bfc159930052d83d974
parentf800cf250f079ab1e1bc1051c34d1d1061187447
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 79854f0aa6a9899bb72d302cbca695b8b3a3b0dc)