[master] Merge branch 'trac2851'

author JINMEI Tatuya <jinmei@isc.org>

Tue, 14 May 2013 16:28:35 +0000 (09:28 -0700)

committer JINMEI Tatuya <jinmei@isc.org>

Tue, 14 May 2013 16:28:35 +0000 (09:28 -0700)
author JINMEI Tatuya <jinmei@isc.org>
Tue, 14 May 2013 16:28:35 +0000 (09:28 -0700)
committer JINMEI Tatuya <jinmei@isc.org>
Tue, 14 May 2013 16:28:35 +0000 (09:28 -0700)
diff --cc src/lib/datasrc/tests/memory/memory_client_unittest.cc
Simple merge
author	JINMEI Tatuya <jinmei@isc.org>
	Tue, 14 May 2013 16:28:35 +0000 (09:28 -0700)
committer	JINMEI Tatuya <jinmei@isc.org>
	Tue, 14 May 2013 16:28:35 +0000 (09:28 -0700)