From: JINMEI Tatuya <jinmei@isc.org>
Date: Mon, 16 Apr 2012 20:47:51 +0000 (-0700)
Subject: [master] Merge branch 'trac1792' with fixing conflicts.
X-Git-Tag: trac2351_base~226^2~116^2~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93f11d2a96ce4dba9308889bdb9be6be4a765b27;p=thirdparty%2Fkea.git

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

93f11d2a96ce4dba9308889bdb9be6be4a765b27