Merged from trunk.

diff --cc configure.in
Simple merge

diff --cc src/HttpReply.cc
Simple merge

diff --cc src/HttpRequest.cc
Simple merge

diff --cc src/HttpRequest.h
Simple merge

diff --cc src/Makefile.am
index 9131f2aca0b4f000edf4b6404bad0d50a9f08e8a,d16a8c4f37dc9a412cfc03e74e2a50e6448ff707..1b20279161dd178cc0a6ebc3df0e1136cd2c1f29
mode 100755,100644..100644
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am

diff --cc src/Server.cc
Simple merge

diff --cc src/Server.h
Simple merge

diff --cc src/adaptation/Makefile.am
Simple merge

diff --cc src/cache_cf.cc
Simple merge

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

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

diff --cc src/main.cc
Simple merge