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)
commite3e7547712ef6b1ff7b22f069e37f9d1187d2898
treedabbfea858be5caf6092d8e2a536cf18c2bd5e25
parentb8b27bec5cbd1e8624a14556e15890958f29b193
parent1dd1bba66c4863ef1f30b573ab500ad2e41ca7e3
Merge branch 'master' into x86