Merge branch 'master' into 2.0_beta
authorLi Peng <peng.li@intel.com>
Wed, 12 Sep 2012 06:30:00 +0000 (14:30 +0800)
committerLi Peng <peng.li@intel.com>
Wed, 12 Sep 2012 06:30:00 +0000 (14:30 +0800)
commitc7c1a50c9c905979a4a2be580de544edc55cd51d
treeb6fa672f341e95e2a0e5c2b8ce0863beecfc374a
parentb298edd3bcd0006dce3fe2c6fcbaf9344e80a8e7
parent2c1ef6c67358b4937632491aa71d78cd4af6de0f
Merge branch 'master' into 2.0_beta