From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 29 Aug 2012 04:41:40 +0000 (-0700)
Subject: [master] Merge branch 'trac2107merge'
X-Git-Tag: trac2351_base~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5db8b95c963cb2d493b24dda0380f71a4df67f2;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2107merge'
---

d5db8b95c963cb2d493b24dda0380f71a4df67f2