Merged from parent (trunk r11728, v3.2.0.11+).

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

Mon, 12 Sep 2011 00:31:13 +0000 (18:31 -0600)

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

Mon, 12 Sep 2011 00:31:13 +0000 (18:31 -0600)
author Alex Rousskov <rousskov@measurement-factory.com>
Mon, 12 Sep 2011 00:31:13 +0000 (18:31 -0600)
committer Alex Rousskov <rousskov@measurement-factory.com>
Mon, 12 Sep 2011 00:31:13 +0000 (18:31 -0600)
diff --cc src/cf.data.pre
Simple merge
diff --cc src/client_side.cc
Simple merge
author	Alex Rousskov <rousskov@measurement-factory.com>
	Mon, 12 Sep 2011 00:31:13 +0000 (18:31 -0600)
committer	Alex Rousskov <rousskov@measurement-factory.com>
	Mon, 12 Sep 2011 00:31:13 +0000 (18:31 -0600)
		1	2
src/cf.data.pre	patch \|	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	patch \|	diff1 \|	diff2 \|	blob \| history