Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 26 Aug 2008 06:27:10 +0000 (16:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 26 Aug 2008 06:27:10 +0000 (16:27 +1000)
commit3010e5e48979bf174547e4f00389dbade7b414d2
tree1914cb68b01e4dddd341e8b747014b9591ff3cf3
parentf1c0c3896edc889f7fda65e27b27aaefc60d46d7
parent4eba234a7352094e1640e8ff9d80a20f8d4705a3
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit d7db5fe161429163a19d18c7e3045939897b9b2a)