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

Trivial merge