From: Xie Jiagui <xiejiagui@cnnic.cn>
Date: Fri, 17 Feb 2012 11:24:16 +0000 (+0800)
Subject: Merge branch 'master' into trac1580
X-Git-Tag: trac2351_base~247^2~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b2b5a2c16102329bdbc7d1421758dcd206fa45f;p=thirdparty%2Fkea.git

Merge branch 'master' into trac1580
---

5b2b5a2c16102329bdbc7d1421758dcd206fa45f