From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 25 Jan 2012 22:54:35 +0000 (-0800)
Subject: [master] Merge branch 'trac1571'
X-Git-Tag: trac2351_base~278^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d22e90b5ef94880183cd652e112399b3efb9bd67;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1571'
---

d22e90b5ef94880183cd652e112399b3efb9bd67