Merge branch 'hotfix-0.1alpha2.4' v0.1alpha2.4
authorXianyi <xianyi@iscas.ac.cn>
Sun, 18 Sep 2011 08:57:28 +0000 (16:57 +0800)
committerXianyi <xianyi@iscas.ac.cn>
Sun, 18 Sep 2011 08:57:28 +0000 (16:57 +0800)

Trivial merge