Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
commit66327b8bd8dbde140b93f000a81ba13e743f27b0
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Apr 2008 14:56:15 +0000 (15 16:56 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Apr 2008 14:56:15 +0000 (15 16:56 +0200)
treede1273aa9188ce249de58d5614947091ec1b3dd5
parentbc0e94360edb99e967dac01a3ecff42de0c1c222
parenta28807569d0cf32968bacdc0bd88197b19fbae49
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet