Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Tue, 22 Apr 2008 08:21:22 +0000 (10:21 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 22 Apr 2008 08:21:22 +0000 (10:21 +0200)

Trivial merge