Merge branch 'develop' v0.2.1
authorXianyi Zhang <xianyi@iscas.ac.cn>
Sat, 30 Jun 2012 00:26:10 +0000 (08:26 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Sat, 30 Jun 2012 00:26:10 +0000 (08:26 +0800)

Trivial merge