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

Trivial merge