Merge branch 'develop' v0.2.2
authorZhang Xianyi <xianyi@iscas.ac.cn>
Fri, 6 Jul 2012 14:09:12 +0000 (22:09 +0800)
committerZhang Xianyi <xianyi@iscas.ac.cn>
Fri, 6 Jul 2012 14:09:12 +0000 (22:09 +0800)

Trivial merge