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


Trivial merge