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

Trivial merge