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)
commit9f0834bfcaf08a957e8f55829e24375f7a30cecd
treec4d7ff92a1afb8ac14bf7b37d31fee98e92668e8
parentbaf3b179ce40747d4aaa96a985faebdcc0883b1c
parentd5d479618a3a791c2fa6bc1017df4f8ee564fd06
Merge branch 'devel'