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)
commitfe75aaa1ca1cdcc7cf9177c7478623983e14edc3
tree95884e7c3ca2fb15db5283330570c079b4e393cc
parentb298edd3bcd0006dce3fe2c6fcbaf9344e80a8e7
parent0e69058b7e92ccca33d98ca404f27508067ab2de
Merge branch 'devel'