Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 12 Mar 2008 23:00:57 +0000 (10:00 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 12 Mar 2008 23:00:57 +0000 (10:00 +1100)
(This used to be commit e9567e39106efb7443ed2c5df3492208b1c1d766)


Trivial merge