Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 15:35:16 +0000 (17:35 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 15:35:16 +0000 (17:35 +0200)
(This used to be commit 16dbbf75c7fa0f877659654a20bcab73b707e627)


Trivial merge