Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jan 2008 22:26:24 +0000 (09:26 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jan 2008 22:26:24 +0000 (09:26 +1100)
(This used to be commit c4aba5ad01f5095ad7a9d0d0f1e3c6afedbbd9b7)

1  2 
source4/selftest/env/Samba4.pm

Simple merge