Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 29 Aug 2008 21:38:02 +0000 (07:38 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 29 Aug 2008 21:38:02 +0000 (07:38 +1000)
commite82f2187325274d728ec7470990f971e7b3db13c
tree25ce940a5b2a57c6191265664fad0e70aee951fa
parent9817f3d785ceb67819a9def0e8030272e4ba9e14
parent81dcc99e9acb9a7e4c2358e5e44998e4718dc658
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit f008c3b6ee324056fd9b63f6151ad6849640c959)