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


Trivial merge