Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 25 Apr 2008 08:24:12 +0000 (09:24 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 25 Apr 2008 08:24:12 +0000 (09:24 +0100)
(This used to be commit 2c3a3d0134b5fe4cd9dfdb05d1b140b2c9b502f1)


Trivial merge