Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
commit67b47606b9c5b794d8feea5ba200098e9b9e33e3
authorAndrew Bartlett <abartlet@samba.org>
Tue, 20 May 2008 01:03:45 +0000 (20 11:03 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 20 May 2008 01:03:45 +0000 (20 11:03 +1000)
tree8086e9b7f09cadc12901ae047a7521009d9beed0
parent6e357d00474de65395ca51524d3b85d00691baf2
parenteae17ae8ecdcb83fdb756189a9d5609a192371a4
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local