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

Trivial merge