Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Mon, 14 Apr 2008 09:32:04 +0000 (11:32 +0200)
committerAndrew Tridgell <tridge@samba.org>
Mon, 14 Apr 2008 09:32:04 +0000 (11:32 +0200)
commit068c973dbeed5b0f5ccab4f780ae7db3535f5910
treeb671b1500b4f66791e7ee9982223dd4d48781063
parent9b686c138037f613da15168d0722786e00f023e5
parent2b8cf1b2a447711d123c563dfbd9a54941155267
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test