Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 9 Apr 2008 02:03:36 +0000 (12:03 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 9 Apr 2008 02:03:36 +0000 (12:03 +1000)
(This used to be commit 58e00594d8c191f499225aa2755a06bac2937300)

1  2 
source4/libnet/config.mk

Simple merge