Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 2 Jul 2008 11:47:21 +0000 (21:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 2 Jul 2008 11:47:21 +0000 (21:47 +1000)
commitb4e7063058ac8587c526dd9133aee345e99f8ef8
tree55c4ae209d0aa6f0717927549960349ae964db05
parentc7704805b9a3541e4c8768278c8289b0aa6ed5e3
parent3da6f7f95d7c04cff49fa2312f94c059686d11e4
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local