Merged from trunk

diff --cc configure.in
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/icmp/Icmp.h
Simple merge