Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
authorJelmer Vernooij <jelmer@samba.org>
Sat, 14 Jun 2008 10:15:24 +0000 (12:15 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 14 Jun 2008 10:15:24 +0000 (12:15 +0200)

Trivial merge