Sync from HEAD

author Amos Jeffries <squid3@treenet.co.nz>

Thu, 21 Jan 2010 23:54:51 +0000 (12:54 +1300)

committer Amos Jeffries <squid3@treenet.co.nz>

Thu, 21 Jan 2010 23:54:51 +0000 (12:54 +1300)
author Amos Jeffries <squid3@treenet.co.nz>
Thu, 21 Jan 2010 23:54:51 +0000 (12:54 +1300)
committer Amos Jeffries <squid3@treenet.co.nz>
Thu, 21 Jan 2010 23:54:51 +0000 (12:54 +1300)
diff --cc configure.in
Simple merge
diff --cc src/adaptation/icap/ModXact.cc
Simple merge
diff --cc src/cf.data.pre
Simple merge
diff --cc src/client_side_request.cc
Simple merge
diff --cc src/errorpage.cc
Simple merge
diff --cc src/http.cc
Simple merge
author	Amos Jeffries <squid3@treenet.co.nz>
	Thu, 21 Jan 2010 23:54:51 +0000 (12:54 +1300)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Thu, 21 Jan 2010 23:54:51 +0000 (12:54 +1300)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/adaptation/icap/ModXact.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	patch \|	diff1 \|	diff2 \|	blob \| history
src/client_side_request.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/errorpage.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/http.cc	patch \|	diff1 \|	diff2 \|	blob \| history