Merged from trunk.

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

Wed, 25 Feb 2009 20:59:20 +0000 (13:59 -0700)

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

Wed, 25 Feb 2009 20:59:20 +0000 (13:59 -0700)
author Alex Rousskov <rousskov@measurement-factory.com>
Wed, 25 Feb 2009 20:59:20 +0000 (13:59 -0700)
committer Alex Rousskov <rousskov@measurement-factory.com>
Wed, 25 Feb 2009 20:59:20 +0000 (13:59 -0700)
diff --cc src/cache_cf.cc
Simple merge
diff --cc src/http.cc
Simple merge
author	Alex Rousskov <rousskov@measurement-factory.com>
	Wed, 25 Feb 2009 20:59:20 +0000 (13:59 -0700)
committer	Alex Rousskov <rousskov@measurement-factory.com>
	Wed, 25 Feb 2009 20:59:20 +0000 (13:59 -0700)
		1	2
src/cache_cf.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/http.cc	patch \|	diff1 \|	diff2 \|	blob \| history