Merge branch 'release-v0.1alpha2' into develop
authorXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 23 Jun 2011 08:07:34 +0000 (16:07 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 23 Jun 2011 08:07:34 +0000 (16:07 +0800)

Trivial merge