Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 04:22:22 +0000 (15:22 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 04:22:22 +0000 (15:22 +1100)

Trivial merge