Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 26 Feb 2008 05:19:57 +0000 (16:19 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 26 Feb 2008 05:19:57 +0000 (16:19 +1100)
(This used to be commit 35f7f488d84e3ec3224f3b40ff5881e91c11764d)


Trivial merge