From: JINMEI Tatuya <jinmei@isc.org>
Date: Mon, 4 Jun 2012 17:16:04 +0000 (-0700)
Subject: [master] Merge branch 'trac1912'
X-Git-Tag: trac2351_base~226^2~60^2^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7130da883f823ce837c10cbf6e216a15e1996e5d;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1912'
---

7130da883f823ce837c10cbf6e216a15e1996e5d