Merge branch 'master' into develop
authorXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 22 Mar 2012 16:00:13 +0000 (00:00 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 22 Mar 2012 16:00:13 +0000 (00:00 +0800)

Trivial merge