Merge branch 'devel'
authorLi Peng <peng.li@intel.com>
Wed, 18 Jul 2012 11:55:09 +0000 (19:55 +0800)
committerLi Peng <peng.li@intel.com>
Wed, 18 Jul 2012 11:55:09 +0000 (19:55 +0800)

Trivial merge