Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 6 May 2008 22:12:16 +0000 (08:12 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 6 May 2008 22:12:16 +0000 (08:12 +1000)
(This used to be commit c21dd40bc73acafe6bd28cfd0de60f2a4b03853a)


Trivial merge