Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 10 Jun 2008 03:19:56 +0000 (13:19 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 10 Jun 2008 03:19:56 +0000 (13:19 +1000)
commit1d52d9cc70158dbe30325220aa5c1e6203c8b72b
tree14212a90d3c4000071bb58b8bd3af0637627d434
parent4ae5c1a8bd43aa04ce54d72a318c7f445e0e5027
parent33700d4a97e14aab1b45b3ddb8c80c48cd789bc6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local