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)
commit9551d4027dd9bbdfa1fcb4a5a117792811ec7f29
treecfb05907f4e142ec997d745e4e251b4a0a5ec953
parente7d993b8b26e121ff37640825b4d2f2c4d6332bf
parente533e7a7ebc8b3029cf604e63cdc6d1cf8570ccd
Merge commit 'origin/v4-0-test' into vfs_smb2
(This used to be commit ffbd222d651dcddb19cacdc50cdbfeaefa816940)
source4/libcli/config.mk