Merge branch 'master' into loongson3a
authorXianyi Zhang <xianyi@iscas.ac.cn>
Wed, 16 Feb 2011 16:39:09 +0000 (00:39 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Wed, 16 Feb 2011 16:39:09 +0000 (00:39 +0800)

Trivial merge