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

Trivial merge