Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 21 Feb 2008 00:07:06 +0000 (01:07 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 21 Feb 2008 00:07:06 +0000 (01:07 +0100)

Trivial merge