Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 12:45:17 +0000 (13:45 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 12:45:17 +0000 (13:45 +0100)
(This used to be commit 8238415f3cf2d48601dd3102edfa2c438155f49a)


Trivial merge