Merged from trunk

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

Wed, 13 Jan 2010 08:34:02 +0000 (09:34 +0100)

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

Wed, 13 Jan 2010 08:34:02 +0000 (09:34 +0100)
author Francesco Chemolli <kinkie@squid-cache.org>
Wed, 13 Jan 2010 08:34:02 +0000 (09:34 +0100)
committer Francesco Chemolli <kinkie@squid-cache.org>
Wed, 13 Jan 2010 08:34:02 +0000 (09:34 +0100)
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/protos.h
Simple merge
diff --cc src/store.cc
Simple merge
author	Francesco Chemolli <kinkie@squid-cache.org>
	Wed, 13 Jan 2010 08:34:02 +0000 (09:34 +0100)
committer	Francesco Chemolli <kinkie@squid-cache.org>
	Wed, 13 Jan 2010 08:34:02 +0000 (09:34 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/protos.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/store.cc	patch \|	diff1 \|	diff2 \|	blob \| history