Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains
authorAndrew Bartlett <abartlet@samba.org>
Mon, 8 Sep 2008 02:54:13 +0000 (12:54 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 8 Sep 2008 02:54:13 +0000 (12:54 +1000)
(This used to be commit a057c3ed9df2670e5cad5f1807e280d77eb58cb0)


Trivial merge