Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 02:16:08 +0000 (13:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 02:16:08 +0000 (13:16 +1100)
(This used to be commit 597f9fe17685fb7909269bc0af04bf4a040e2ad7)


Trivial merge