Merge from trunk

diff --cc src/cache_cf.cc
Simple merge

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

diff --cc src/errorpage.cc
Simple merge

diff --cc src/errorpage.h
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/main.cc
Simple merge

diff --cc src/structs.h
Simple merge