From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 4 Apr 2012 22:28:29 +0000 (-0700)
Subject: [master] Merge branch 'trac1773new'
X-Git-Tag: trac2351_base~226^2~116^2~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ceaa247d89ac7d97594572bc17f005144c5efb8d;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1773new'
---

ceaa247d89ac7d97594572bc17f005144c5efb8d