Merge branch 'devel'
authorLi Peng <peng.li@intel.com>
Mon, 27 Aug 2012 02:10:03 +0000 (10:10 +0800)
committerLi Peng <peng.li@intel.com>
Mon, 27 Aug 2012 02:10:03 +0000 (10:10 +0800)
commit54ec28b3c7e36eb17bb96bcf459802223c09ba62
tree9762d08cbb1b3d7f322a78058fd2f25a800f713a
parent35694325c5d443828896018e4b075d62da25a568
parent45aae16324ae74571413d2eb2199c5398360f287
Merge branch 'devel'