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

author JINMEI Tatuya <jinmei@isc.org>

Mon, 16 Apr 2012 20:47:51 +0000 (13:47 -0700)

committer JINMEI Tatuya <jinmei@isc.org>

Mon, 16 Apr 2012 20:47:51 +0000 (13:47 -0700)
author JINMEI Tatuya <jinmei@isc.org>
Mon, 16 Apr 2012 20:47:51 +0000 (13:47 -0700)
committer JINMEI Tatuya <jinmei@isc.org>
Mon, 16 Apr 2012 20:47:51 +0000 (13:47 -0700)
diff --cc src/lib/datasrc/tests/Makefile.am
Simple merge
diff --cc src/lib/datasrc/tests/database_unittest.cc
Simple merge
diff --cc src/lib/datasrc/tests/test_client.cc
Simple merge
author	JINMEI Tatuya <jinmei@isc.org>
	Mon, 16 Apr 2012 20:47:51 +0000 (13:47 -0700)
committer	JINMEI Tatuya <jinmei@isc.org>
	Mon, 16 Apr 2012 20:47:51 +0000 (13:47 -0700)
		1	2
src/lib/datasrc/tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/tests/database_unittest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/tests/test_client.cc	patch \|	diff1 \|	diff2 \|	blob \| history