[2297] Merge branch 'trac2297' of ssh://git.bind10.isc.org/var/bind10/git/bind10...

author JINMEI Tatuya <jinmei@isc.org>

Thu, 25 Oct 2012 00:16:23 +0000 (17:16 -0700)

committer JINMEI Tatuya <jinmei@isc.org>

Thu, 25 Oct 2012 00:16:23 +0000 (17:16 -0700)
author JINMEI Tatuya <jinmei@isc.org>
Thu, 25 Oct 2012 00:16:23 +0000 (17:16 -0700)
committer JINMEI Tatuya <jinmei@isc.org>
Thu, 25 Oct 2012 00:16:23 +0000 (17:16 -0700)
diff --cc src/lib/python/isc/sysinfo/sysinfo.py
Simple merge
diff --cc src/lib/python/isc/sysinfo/tests/sysinfo_test.py
Simple merge
author	JINMEI Tatuya <jinmei@isc.org>
	Thu, 25 Oct 2012 00:16:23 +0000 (17:16 -0700)
committer	JINMEI Tatuya <jinmei@isc.org>
	Thu, 25 Oct 2012 00:16:23 +0000 (17:16 -0700)
		1	2
src/lib/python/isc/sysinfo/sysinfo.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/python/isc/sysinfo/tests/sysinfo_test.py	patch \|	diff1 \|	diff2 \|	blob \| history