Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 6 Mar 2008 11:02:25 +0000 (22:02 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 6 Mar 2008 11:02:25 +0000 (22:02 +1100)
(This used to be commit 2232255ce384433ff9626f2fd3d399f758b0add5)


Trivial merge