From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 26 Jan 2012 19:34:53 +0000 (-0800)
Subject: [master] Merge branch 'trac1614'
X-Git-Tag: trac2351_base~278^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8241ea5a4adea1b42a60ee7f2c5cfb87301734c;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1614'
---

e8241ea5a4adea1b42a60ee7f2c5cfb87301734c