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)
commitcd5e48649ce0987952b2b55ea79c3ecceecfafd5
treee5b5034b20d84627ec69a02c2f2f184842902288
parent68afc2893c032be0a8a31d996f90574ceb6c10ad
parent82940f6ca120026378e6deb49a07becb2d581f45
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local