Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 6 Feb 2008 05:14:09 +0000 (16:14 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 6 Feb 2008 05:14:09 +0000 (16:14 +1100)

Trivial merge