Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sun, 11 May 2008 23:44:27 +0000 (09:44 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 11 May 2008 23:44:27 +0000 (09:44 +1000)
(This used to be commit 61c31dc7cf649bc6f2d14bc8637e50ead9b9210a)


Trivial merge