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)

Trivial merge