Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 15 Feb 2008 02:30:55 +0000 (13:30 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 15 Feb 2008 02:30:55 +0000 (13:30 +1100)
commit5c615b0dc58d0fdd0f9ef129c07e44d1e4a0947c
tree3568dad2be35a6fa96bd065820cec452fed2b61e
parent60b314428008878f949b9fba54825c2f4f900288
parentf3bbe1516c95ac29b3ff51a2b5a91105d315524b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 9c12b5b49679d404ac623041f2da944019f97754)