Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:48 +0000 (17:46 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:48 +0000 (17:46 +1000)
commit3bd2a50bab2fdb1e25f61d625b920bac016a261b
tree4a785cbead3905e9f0462dae1e299d20e61628e8
parentf2eaa4beaa1439a9b60005791a764019ae975853
parent0965b22ec561588201a3a79f1f1e316834c8ce0b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 7ad0d8dd4dab6119ca6f94b64b35c8f975a27d0a)