Merge commit 'origin/v4-0-test' into trusted-domains
authorAndrew Bartlett <abartlet@samba.org>
Thu, 4 Sep 2008 01:32:32 +0000 (11:32 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 4 Sep 2008 01:32:32 +0000 (11:32 +1000)

Trivial merge