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

Trivial merge