Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 02:13:45 +0000 (12:13 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 02:13:45 +0000 (12:13 +1000)
(This used to be commit 7594f79db6a0e8a46e2863829e5e050b03dfaec1)


Trivial merge