From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 30 Dec 2011 08:18:54 +0000 (-0800)
Subject: [master] Merge branch 'trac1502'
X-Git-Tag: trac2351_base~310^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57b06f8cb6681f591fa63f25a053eb6f422896ef;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1502'
---

57b06f8cb6681f591fa63f25a053eb6f422896ef