Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Wed, 20 Feb 2008 18:41:52 +0000 (19:41 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 20 Feb 2008 18:41:52 +0000 (19:41 +0100)

Trivial merge