Merge branch 'release-0.1.1'
authorXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 29 Apr 2012 10:41:21 +0000 (18:41 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Sun, 29 Apr 2012 10:41:21 +0000 (18:41 +0800)

Trivial merge