Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into tmp
authorJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 14:53:10 +0000 (16:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 14:53:10 +0000 (16:53 +0200)

Trivial merge