Merge commit 'origin/x86' into loongson3a
authorXianyi Zhang <traits.zhang@gmail.com>
Fri, 4 Mar 2011 14:11:52 +0000 (14:11 +0000)
committerXianyi Zhang <traits.zhang@gmail.com>
Fri, 4 Mar 2011 14:11:52 +0000 (14:11 +0000)

Trivial merge