Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 23:59:14 +0000 (10:59 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 23:59:14 +0000 (10:59 +1100)

Trivial merge