Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Tue, 20 May 2008 05:35:49 +0000 (15:35 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 20 May 2008 05:35:49 +0000 (15:35 +1000)
commitcd167fd44b1833789f6e57766e4c5393bc468ff7
tree0a394bfa562b1a4d53976cdf4db429f46602f8a1
parent5ca6f42510cd746f62d3973a3c01085876c71b7b
parent52f0af3990f79dfc6b2e784eed9e58a2a705d1ea
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit e360be0b99b638afdfa789e217bf08f99d09be7a)