Merge branch 'devel'
authorLi Peng <peng.li@intel.com>
Fri, 27 Jul 2012 10:28:21 +0000 (18:28 +0800)
committerLi Peng <peng.li@intel.com>
Fri, 27 Jul 2012 10:28:21 +0000 (18:28 +0800)

Trivial merge