Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 24 Mar 2008 23:29:35 +0000 (10:29 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 24 Mar 2008 23:29:35 +0000 (10:29 +1100)
(This used to be commit 3903ef9168a18d34517c78536d34e147a9bc01cd)


Trivial merge