From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 29 Feb 2012 21:32:01 +0000 (-0800)
Subject: [master] Merge branch 'trac1697'
X-Git-Tag: trac2351_base~226^2~116^2~139
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cabc799f2bf9a3579dae7f1f5d5467c8bb1aa40;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1697'
---

9cabc799f2bf9a3579dae7f1f5d5467c8bb1aa40