Merge branch 'release-0.2.0' v0.2.0
authorZhang Xianyi <xianyi@iscas.ac.cn>
Mon, 25 Jun 2012 23:45:23 +0000 (07:45 +0800)
committerZhang Xianyi <xianyi@iscas.ac.cn>
Mon, 25 Jun 2012 23:45:23 +0000 (07:45 +0800)

Trivial merge