Merged from trunk

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

Mon, 3 Sep 2012 07:16:45 +0000 (09:16 +0200)

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

Mon, 3 Sep 2012 07:16:45 +0000 (09:16 +0200)
author Francesco Chemolli <kinkie@squid-cache.org>
Mon, 3 Sep 2012 07:16:45 +0000 (09:16 +0200)
committer Francesco Chemolli <kinkie@squid-cache.org>
Mon, 3 Sep 2012 07:16:45 +0000 (09:16 +0200)
diff --cc src/CpuAffinitySet.cc
Simple merge
diff --cc src/CpuAffinitySet.h
Simple merge
diff --cc src/client_side.cc
Simple merge
diff --cc src/client_side_reply.cc
Simple merge
diff --cc src/neighbors.cc
Simple merge
author	Francesco Chemolli <kinkie@squid-cache.org>
	Mon, 3 Sep 2012 07:16:45 +0000 (09:16 +0200)
committer	Francesco Chemolli <kinkie@squid-cache.org>
	Mon, 3 Sep 2012 07:16:45 +0000 (09:16 +0200)
		1	2
src/CpuAffinitySet.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/CpuAffinitySet.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client_side_reply.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/neighbors.cc	patch \|	diff1 \|	diff2 \|	blob \| history