Merge commit 'origin/v4-0-test' into vfs_smb2
authorAndrew Tridgell <tridge@samba.org>
Mon, 19 May 2008 01:40:25 +0000 (11:40 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 19 May 2008 01:40:25 +0000 (11:40 +1000)
commit03eb236f20e6efef9993e8beabfbae16787f32fb
tree40de32d36e412da0f028cc2822f47555ff8d0ffc
parent66cbf7eb59ab4a29dca1d30850c9aeb35a598b3d
parent022ab33222539276272b7399a5df310e1c548ca0
Merge commit 'origin/v4-0-test' into vfs_smb2
(This used to be commit 733937e87a1adcc19492ea2bd138e705701901b6)
source4/libcli/config.mk
source4/ntvfs/config.mk