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:09:35 +0000 (10:09 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 28 Feb 2008 23:09:35 +0000 (10:09 +1100)
(This used to be commit f002a98c7ae0fc93cc738fde1ee62534f8e576ac)


Trivial merge