Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:48 +0000 (17:46 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 12 Aug 2008 07:46:48 +0000 (17:46 +1000)
(This used to be commit 7ad0d8dd4dab6119ca6f94b64b35c8f975a27d0a)


Trivial merge