From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 26 Jul 2012 16:24:57 +0000 (-0700)
Subject: [master] Merge branch 'trac2152'
X-Git-Tag: trac2351_base~97^2~7^2~2^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf17e8fb413862c562e37039249d2168248735a7;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2152'
---

cf17e8fb413862c562e37039249d2168248735a7