Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 12:23:25 +0000 (22:23 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 12:23:25 +0000 (22:23 +1000)
commite728596eec2157eefb1fe72789284567f3880388
tree3c37dc90f6be883075ede74d76baad0eba526106
parent1dfa50a48040bdc1166be2dbe1063fd8a79166f8
parent3b1f5d10360ed1b26980d748a7c9be6db5977bd3
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test