Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into docstrings2
authorJelmer Vernooij <jelmer@samba.org>
Fri, 23 May 2008 13:20:57 +0000 (15:20 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 23 May 2008 13:20:57 +0000 (15:20 +0200)
(This used to be commit 7ca46322f5aa650cfd89c4f887393da67ae9dc7b)


Trivial merge