Merge from trunk

diff --cc doc/release-notes/release-3.2.sgml
Simple merge

diff --cc src/HttpRequest.cc
Simple merge

diff --cc src/adaptation/icap/ModXact.cc
Simple merge

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

diff --cc src/dns_internal.cc
Simple merge

diff --cc src/ftp.cc
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/main.cc
Simple merge

diff --cc src/protos.h
Simple merge

diff --cc src/snmp_core.cc
Simple merge

diff --cc src/structs.h
Simple merge