Makefile.mak: syncrhonize with latest changes
Makefile.mak: syncrhonize with latest changes

richarddzh/vlfeat,richarddzh/vlfeat,qubick/vlfeat,hongzhili/vlfeat,rxl194/vlfeat,richarddzh/vlfeat,richarddzh/vlfeat,WangDequan/vlfeat,CansenJIANG/vlfeat,j-bo/vlfeat,richarddzh/vlfeat,rxl194/vlfeat,hongzhili/vlfeat,rxl194/vlfeat,CansenJIANG/vlfeat,rxl194/vlfeat,erexhepa/vlfeat,hongzhili/vlfeat,cvfish/vlfeat,erexhepa/vlfeat,vlfeat/vlfeat,j-bo/vlfeat,j-bo/vlfeat,cvfish/vlfeat,vlfeat/vlfeat,cvfish/vlfeat,WangDequan/vlfeat,cvfish/vlfeat,WangDequan/vlfeat,rxl194/vlfeat,mylxiaoyi/vlfeat,qubick/vlfeat,rxl194/vlfeat,qubick/vlfeat,cvfish/vlfeat,CansenJIANG/vlfeat,vlfeat/vlfeat,erexhepa/vlfeat,WangDequan/vlfeat,erexhepa/vlfeat,cvfish/vlfeat,qubick/vlfeat,CansenJIANG/vlfeat,qubick/vlfeat,vlfeat/vlfeat,mylxiaoyi/vlfeat,erexhepa/vlfeat,mylxiaoyi/vlfeat,WangDequan/vlfeat,mylxiaoyi/vlfeat,mylxiaoyi/vlfeat,j-bo/vlfeat,erexhepa/vlfeat,vlfeat/vlfeat,richarddzh/vlfeat,hongzhili/vlfeat,vlfeat/vlfeat,CansenJIANG/vlfeat,hongzhili/vlfeat,j-bo/vlfeat,qubick/vlfeat,CansenJIANG/vlfeat,hongzhili/vlfeat,WangDequan/vlfeat,mylxiaoyi/vlfeat