From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 6 Jun 2012 21:29:03 +0000 (-0700)
Subject: [master] Merge branch 'trac1513'
X-Git-Tag: trac2351_base~226^2~59^2~7^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ae5787bbe982a751ed058e7c4ccf77d760627dd;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1513'
---

6ae5787bbe982a751ed058e7c4ccf77d760627dd