Merge branch 'devel'
authorLi Peng <peng.li@intel.com>
Fri, 31 Aug 2012 07:58:22 +0000 (15:58 +0800)
committerLi Peng <peng.li@intel.com>
Fri, 31 Aug 2012 07:58:22 +0000 (15:58 +0800)

Trivial merge