From: JINMEI Tatuya <jinmei@isc.org>
Date: Mon, 12 Mar 2012 22:18:47 +0000 (-0700)
Subject: [master] Merge branch 'trac1603'
X-Git-Tag: trac2351_base~226^2~116^2~127^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a2a86f3f47b60ff017ce1a040941d0c145cfe16;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1603'
---

9a2a86f3f47b60ff017ce1a040941d0c145cfe16