Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 20:08:49 +0000 (22:08 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 20:08:49 +0000 (22:08 +0200)
(This used to be commit 70ebb22c3df178a26c26c0a25c5722ff9ccdb0b4)


Trivial merge