Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 14 Feb 2008 11:03:11 +0000 (12:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 14 Feb 2008 11:03:11 +0000 (12:03 +0100)
(This used to be commit 50697762fd28e2fc77142c5fea528b12d4cc0ebc)


Trivial merge