Merge remote branch 'origin/x86' into loongson3a
authorXianyi Zhang <xianyi@iscas.ac.cn>
Wed, 2 Mar 2011 05:52:05 +0000 (13:52 +0800)
committerXianyi Zhang <xianyi@iscas.ac.cn>
Wed, 2 Mar 2011 05:52:05 +0000 (13:52 +0800)

Trivial merge