Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 30 May 2008 07:26:42 +0000 (17:26 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 30 May 2008 07:26:42 +0000 (17:26 +1000)
(This used to be commit 31308caad0a83a487341307e4e810a69c08ff371)


Trivial merge