Merge commit 'origin/v4-0-test' into vfs_smb2
authorAndrew Tridgell <tridge@samba.org>
Tue, 20 May 2008 01:37:23 +0000 (11:37 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 20 May 2008 01:37:23 +0000 (11:37 +1000)
(This used to be commit ffbd222d651dcddb19cacdc50cdbfeaefa816940)

1  2 
source4/libcli/config.mk

Simple merge