Merged from trunk

author Francesco Chemolli <kinkie@squid-cache.org>

Mon, 5 Jul 2010 10:09:39 +0000 (12:09 +0200)

committer Francesco Chemolli <kinkie@squid-cache.org>

Mon, 5 Jul 2010 10:09:39 +0000 (12:09 +0200)
author Francesco Chemolli <kinkie@squid-cache.org>
Mon, 5 Jul 2010 10:09:39 +0000 (12:09 +0200)
committer Francesco Chemolli <kinkie@squid-cache.org>
Mon, 5 Jul 2010 10:09:39 +0000 (12:09 +0200)
diff --cc configure.in
Simple merge
diff --cc src/cf.data.pre
Simple merge
diff --cc src/errorpage.cc
Simple merge
diff --cc src/http.cc
Simple merge
author	Francesco Chemolli <kinkie@squid-cache.org>
	Mon, 5 Jul 2010 10:09:39 +0000 (12:09 +0200)
committer	Francesco Chemolli <kinkie@squid-cache.org>
	Mon, 5 Jul 2010 10:09:39 +0000 (12:09 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	patch \|	diff1 \|	diff2 \|	blob \| history
src/errorpage.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/http.cc	patch \|	diff1 \|	diff2 \|	blob \| history