Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 16:44:48 +0000 (18:44 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 16:44:48 +0000 (18:44 +0200)
commit22bbb0ebe67bc1eb4014d399edcf03340fd6c803
tree28a62f0221e2c499ee108c205567033dbafa54da
parentc9a12fa55d63e4bccb5b453186022dae1da39032
parent3180cbbc5b3396da07c325166e472b143b3abe1e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 43fc10aaa7c3d50cb9fee5ecab859103aec4a62e)