Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
authorJelmer Vernooij <jelmer@samba.org>
Sun, 27 Jul 2008 17:57:27 +0000 (19:57 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 27 Jul 2008 17:57:27 +0000 (19:57 +0200)
(This used to be commit 7e90cc197c4fb2884f368cd72f391d0d8016fb96)


Trivial merge