Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 05:39:03 +0000 (16:39 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jan 2008 05:39:03 +0000 (16:39 +1100)
(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)


Trivial merge