Merge commit 'origin/v4-0-test' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 13:28:44 +0000 (23:28 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 13:28:44 +0000 (23:28 +1000)
commit8fc9c71a06c49bd449b754405e0c937681f07f50
tree7484b3f6a7bc4e8c561582ac1403b3ca36851727
parent2e0f61a18ab002a90faa06477fa258e36b8a5fc0
parent5ab27ba7f0facbad4ba14b4246bc47e05b5da347
Merge commit 'origin/v4-0-test' into v4-0-test
(This used to be commit 2bba77a768c3ed984af05b99c2f7781577d08ec3)