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 20:27:49 +0000 (07:27 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 15 Feb 2008 20:27:49 +0000 (07:27 +1100)
commit10e2530eed6e9ce0c532a2b62eee4c315e62b2ea
tree426d2d1290083bd414b1a445f6f10ceed17b4f5f
parent2e4e06c6e69d881b0fc3c53df50db607fcce4a91
parent57e910668d70a266ddf3a1296625fec17661a882
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 26475a231f73aaeef31e433b33dbfee6158e321d)