Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 16:44:48 +0000 (18:44 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 16:44:48 +0000 (18:44 +0200)
(This used to be commit 43fc10aaa7c3d50cb9fee5ecab859103aec4a62e)


Trivial merge