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


Trivial merge