From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 31 Jul 2012 16:58:28 +0000 (-0700)
Subject: [master] Merge branch 'trac2095' with fixing conflicts.
X-Git-Tag: trac2351_base~137^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9beeb21edb0d0d9c90cb56da22a926a4cafdf192;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2095' with fixing conflicts.
---

9beeb21edb0d0d9c90cb56da22a926a4cafdf192