From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 24 Aug 2012 22:52:02 +0000 (-0700)
Subject: [master] Merge branch 'trac2100'
X-Git-Tag: trac2351_base~115^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=300c412c3f474b537a739fc38bd37a89cf35a78e;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2100'
---

300c412c3f474b537a739fc38bd37a89cf35a78e