Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
authorJelmer Vernooij <jelmer@samba.org>
Fri, 12 Sep 2008 19:31:56 +0000 (21:31 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 12 Sep 2008 19:31:56 +0000 (21:31 +0200)
(This used to be commit eff27744d3dcb4f6bcdf9bd03583bb38634c398d)


Trivial merge