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


Trivial merge