From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 10 Oct 2012 21:52:37 +0000 (-0700)
Subject: [2340] Merge branch 'master' into trac2340
X-Git-Tag: trac2402_base~15^2~25^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73aebe53f210471b768d79b1f24ee154c56c8554;p=thirdparty%2Fkea.git

[2340] Merge branch 'master' into trac2340
---

73aebe53f210471b768d79b1f24ee154c56c8554