Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 1 Jul 2008 04:54:23 +0000 (14:54 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 1 Jul 2008 04:54:23 +0000 (14:54 +1000)
commit8974bf92a84091ce4b6cd42525648a71a4ca20b4
tree3759053b28c3484161a289ea8ba9ec43dd06d6d7
parentb3e8d3ad99141f6c1aaf7c314284bb33ca9cf2bf
parent5767b578a0ad9db91bb5f4ca5e74615c663034a7
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit cd5e48649ce0987952b2b55ea79c3ecceecfafd5)