From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 4 Apr 2012 21:43:57 +0000 (-0700)
Subject: [master] Merge branch 'trac1820'
X-Git-Tag: trac2351_base~226^2~116^2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=923c859c0ff6fcfc3d0c268cd20d493b71e66d29;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1820'
---

923c859c0ff6fcfc3d0c268cd20d493b71e66d29