Merge branch 'devel'
authorLi Peng <peng.li@intel.com>
Mon, 13 Aug 2012 02:36:47 +0000 (10:36 +0800)
committerLi Peng <peng.li@intel.com>
Mon, 13 Aug 2012 02:36:47 +0000 (10:36 +0800)
commit0455f7079f8a8f246d8a66c7f262b6942a5c17a7
treea53ca474a55bd55df159f1e89b2140605533c556
parentc55de4abe12ab41aac15ab03eb0c74cee3caa649
parentafe18a1d576790bc1a68b7f1a6ee4765a509ed95
Merge branch 'devel'