Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
authorJelmer Vernooij <jelmer@samba.org>
Tue, 17 Jun 2008 11:48:29 +0000 (13:48 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 17 Jun 2008 11:48:29 +0000 (13:48 +0200)
(This used to be commit 30a33cd0a64c434d6aee551f641343c3b2a6d9ca)

1  2 
source4/selftest/target/Samba4.pm

Simple merge