Merge branch 'develop' v0.1.1
authorXianyi Zhang <xianyi@iscas.ac.cn>
Mon, 30 Apr 2012 05:07:14 +0000 (13:07 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Mon, 30 Apr 2012 05:07:14 +0000 (13:07 +0800)

Trivial merge