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)
commit7361899e80c1001eb7d7c13b12ba72cbc3b758f2
treeb8e7547f0981c487e328b1aad996850a5378fe35
parent275f32ae2df333c089343dd20fc4efee1bed2b7b
parent2bb20aa8a8ff1170fd4d2a349a421990b0d7c235
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 068c973dbeed5b0f5ccab4f780ae7db3535f5910)