Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Wed, 13 Feb 2008 16:03:49 +0000 (17:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 13 Feb 2008 16:03:49 +0000 (17:03 +0100)

Trivial merge