[master] Merge branch 'trac2095' with fixing conflicts.

author JINMEI Tatuya <jinmei@isc.org>

Tue, 31 Jul 2012 16:58:28 +0000 (09:58 -0700)

committer JINMEI Tatuya <jinmei@isc.org>

Tue, 31 Jul 2012 16:58:28 +0000 (09:58 -0700)
author JINMEI Tatuya <jinmei@isc.org>
Tue, 31 Jul 2012 16:58:28 +0000 (09:58 -0700)
committer JINMEI Tatuya <jinmei@isc.org>
Tue, 31 Jul 2012 16:58:28 +0000 (09:58 -0700)
diff --cc src/lib/datasrc/memory/rdata_encoder.cc
Simple merge
diff --cc src/lib/datasrc/memory/rdata_encoder.h
Simple merge
author	JINMEI Tatuya <jinmei@isc.org>
	Tue, 31 Jul 2012 16:58:28 +0000 (09:58 -0700)
committer	JINMEI Tatuya <jinmei@isc.org>
	Tue, 31 Jul 2012 16:58:28 +0000 (09:58 -0700)
		1	2
src/lib/datasrc/memory/rdata_encoder.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/memory/rdata_encoder.h	patch \|	diff1 \|	diff2 \|	blob \| history