Merge commit 'origin/v4-0-test' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 06:09:10 +0000 (16:09 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 22 May 2008 06:09:10 +0000 (16:09 +1000)
(This used to be commit d7f3348c891e14de0e1b195714468ff998400f60)


Trivial merge