Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 4 Feb 2008 22:16:37 +0000 (09:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 4 Feb 2008 22:16:37 +0000 (09:16 +1100)
(This used to be commit 7fc3669b9dc34514d8749d3941514fdae7d0f700)


Trivial merge