Merged from trunk.

author Alex Rousskov <rousskov@measurement-factory.com>

Tue, 10 Mar 2009 21:00:00 +0000 (15:00 -0600)

committer Alex Rousskov <rousskov@measurement-factory.com>

Tue, 10 Mar 2009 21:00:00 +0000 (15:00 -0600)
author Alex Rousskov <rousskov@measurement-factory.com>
Tue, 10 Mar 2009 21:00:00 +0000 (15:00 -0600)
committer Alex Rousskov <rousskov@measurement-factory.com>
Tue, 10 Mar 2009 21:00:00 +0000 (15:00 -0600)
diff --cc configure.in
Simple merge
diff --cc src/HttpHeaderTools.cc
Simple merge
diff --cc src/acl/Ip.cc
Simple merge
diff --cc src/cache_cf.cc
Simple merge
diff --cc src/client_side.cc
Simple merge
author	Alex Rousskov <rousskov@measurement-factory.com>
	Tue, 10 Mar 2009 21:00:00 +0000 (15:00 -0600)
committer	Alex Rousskov <rousskov@measurement-factory.com>
	Tue, 10 Mar 2009 21:00:00 +0000 (15:00 -0600)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/HttpHeaderTools.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/acl/Ip.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	patch \|	diff1 \|	diff2 \|	blob \| history