Merge branch 'develop' into loongson3a
authorXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 7 Jul 2011 06:25:51 +0000 (14:25 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Thu, 7 Jul 2011 06:25:51 +0000 (14:25 +0800)

Trivial merge