Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 16:01:40 +0000 (18:01 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 16:01:40 +0000 (18:01 +0200)
(This used to be commit f610862dc900cb3ddf0f275641bc3b66ad1f3bc4)


Trivial merge