Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 10:03:56 +0000 (20:03 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 10:03:56 +0000 (20:03 +1000)
(This used to be commit ad7f05fd94a19ebae678c733077c59fcea66e5ad)


Trivial merge