Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into HEAD
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 09:10:56 +0000 (11:10 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 09:10:56 +0000 (11:10 +0200)
(This used to be commit a039acb9156b3855e8565ce6d1ca078aea18a349)


Trivial merge