[2380] Merge branch 'master' into trac2380

author JINMEI Tatuya <jinmei@isc.org>

Thu, 13 Dec 2012 22:29:26 +0000 (14:29 -0800)

committer JINMEI Tatuya <jinmei@isc.org>

Thu, 13 Dec 2012 22:29:26 +0000 (14:29 -0800)
author JINMEI Tatuya <jinmei@isc.org>
Thu, 13 Dec 2012 22:29:26 +0000 (14:29 -0800)
committer JINMEI Tatuya <jinmei@isc.org>
Thu, 13 Dec 2012 22:29:26 +0000 (14:29 -0800)
diff --cc src/lib/python/isc/datasrc/client_python.cc
Simple merge
author	JINMEI Tatuya <jinmei@isc.org>
	Thu, 13 Dec 2012 22:29:26 +0000 (14:29 -0800)
committer	JINMEI Tatuya <jinmei@isc.org>
	Thu, 13 Dec 2012 22:29:26 +0000 (14:29 -0800)