Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
authorJelmer Vernooij <jelmer@samba.org>
Fri, 1 Aug 2008 19:36:49 +0000 (21:36 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 1 Aug 2008 19:36:49 +0000 (21:36 +0200)
(This used to be commit 8e201ecf3e86c3c8865c7276fad8dad07106efaf)


Trivial merge