Merge branch 'hotfix-0.1alpha2.4' into develop
authorXianyi <xianyi@iscas.ac.cn>
Sun, 18 Sep 2011 09:00:29 +0000 (17:00 +0800)
committerXianyi <xianyi@iscas.ac.cn>
Sun, 18 Sep 2011 09:00:29 +0000 (17:00 +0800)

Trivial merge