From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 30 May 2013 16:59:16 +0000 (-0700)
Subject: [master] Merge branch 'trac2911'
X-Git-Tag: bind10-1.2.0beta1-release~418^2~9^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8118f8e4e9c0ad3e7b690bbce265a163e4f8767a;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2911'

Fixed Conflicts:
	ChangeLog
---

8118f8e4e9c0ad3e7b690bbce265a163e4f8767a