From: Xie Jiagui <xiejiagui@cnnic.cn>
Date: Wed, 4 Jan 2012 03:18:28 +0000 (+0800)
Subject: Merge branch 'master' into trac1462
X-Git-Tag: trac2351_base~310
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ceeb87f6d539c413ebdc66e4cf718e7eb8559c45;p=thirdparty%2Fkea.git

Merge branch 'master' into trac1462
---

ceeb87f6d539c413ebdc66e4cf718e7eb8559c45