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

Trivial merge