Merge branch 'hotfix-0.1alpha2.5' into develop
authorXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 19 Feb 2012 15:11:06 +0000 (23:11 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 19 Feb 2012 15:11:06 +0000 (23:11 +0800)

Trivial merge