Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
authorJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:57:07 +0000 (22:57 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:57:07 +0000 (22:57 +0200)

Trivial merge