Merge branch 'sandybridge' into release-0.2.0
authorZhang Xianyi <xianyi@iscas.ac.cn>
Sat, 23 Jun 2012 00:00:44 +0000 (08:00 +0800)
committerZhang Xianyi <xianyi@iscas.ac.cn>
Sat, 23 Jun 2012 00:00:44 +0000 (08:00 +0800)

Trivial merge