Merge branch 'hotfix-readme_about_branches' into develop
authorXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 12 May 2011 11:06:31 +0000 (19:06 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 12 May 2011 11:06:31 +0000 (19:06 +0800)

Trivial merge