Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Wed, 28 May 2008 03:40:18 +0000 (13:40 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 28 May 2008 03:40:18 +0000 (13:40 +1000)
commitbb264d3a1f212be7eca4b38e61db19de8a26e158
treee44e69f4dcf8959fcfaffca13eff3c10ac2b055c
parent275e057bea09c1d15228963a5b5650df28a4b24b
parent8fb5ac6227e2b6123bb9fabc99fba36bd9aa0a92
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 7ae25aa6125e5375ac9c080a1e95fa34bda0dbe1)