Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 19 Feb 2008 03:45:23 +0000 (14:45 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 19 Feb 2008 03:45:23 +0000 (14:45 +1100)
1  2 
source/torture/config.mk

Simple merge