Merge branch 'develop' into sandybridge
authorZhang Xianyi <xianyi@iscas.ac.cn>
Sat, 16 Jun 2012 14:07:17 +0000 (22:07 +0800)
committerZhang Xianyi <xianyi@iscas.ac.cn>
Sat, 16 Jun 2012 14:07:17 +0000 (22:07 +0800)

Trivial merge