Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 19 May 2008 22:27:08 +0000 (08:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 19 May 2008 22:27:08 +0000 (08:27 +1000)
(This used to be commit 69bac908bec3216d2f17042aa05ab8d4b55b0918)


Trivial merge