Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sat, 19 Apr 2008 07:59:07 +0000 (09:59 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 19 Apr 2008 07:59:07 +0000 (09:59 +0200)
(This used to be commit 13a0941d3432dc7dae552048265ad1e762b781d4)


Trivial merge