From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 10 Oct 2012 16:19:06 +0000 (-0700)
Subject: [master] Merge branch 'trac2204'
X-Git-Tag: trac2351_base~1^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=183ea20803b1dfc0bb6e932c75623864cd0a0def;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2204'
---

183ea20803b1dfc0bb6e932c75623864cd0a0def