Merge from trunk

diff --cc src/HttpRequest.cc
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side.h
Simple merge

diff --cc src/fqdncache.cc
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/ipcache.cc
Simple merge

diff --cc src/main.cc
Simple merge

diff --cc src/protos.h
Simple merge

diff --cc src/structs.h
Simple merge

diff --cc src/typedefs.h
Simple merge