Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:41:50 +0000 (20:41 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:41:50 +0000 (20:41 +1000)
(This used to be commit b4b14b748e6babc93faee23fe8f5c03ec2d25cbb)


Trivial merge