Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 27 Feb 2008 23:33:54 +0000 (10:33 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 27 Feb 2008 23:33:54 +0000 (10:33 +1100)
(This used to be commit ba864cfd7ce4b69179431131cac9661cbf48bf32)


Trivial merge