Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 10:27:43 +0000 (20:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 10:27:43 +0000 (20:27 +1000)
commitd904b71879cf980f602bfd400cf98396616c13e1
treefaffbb30f594b04903813f5267bd0c7d01c5d575
parentcc44b10c240e22a7db83c641a9015dad3ec2e0de
parent63d91e9ab0ecc1e80edff27ae09b249c68453106
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 7fb8179f214bbba95eb35d221cb9892b55afe121)