Merged from trunk

diff --cc src/Makefile.am
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/mem.cc
Simple merge

diff --cc src/protos.h
Simple merge

diff --cc src/structs.h
Simple merge