Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pidldocs
authorJelmer Vernooij <jelmer@samba.org>
Tue, 8 Apr 2008 11:32:38 +0000 (13:32 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 8 Apr 2008 11:32:38 +0000 (13:32 +0200)

Trivial merge