Merge commit 'origin/v4-0-test' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 08:39:52 +0000 (18:39 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 08:39:52 +0000 (18:39 +1000)
(This used to be commit 93cf0b3c7e6d8a4758c44519de51e51be89f76c7)


Trivial merge