Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 13 Mar 2008 22:59:24 +0000 (09:59 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 13 Mar 2008 22:59:24 +0000 (09:59 +1100)
(This used to be commit d50b76ed71ab6bc8e63926540638df5af10202ae)


Trivial merge