Merge branch 'master' into devel
authorYi Yang <yi.y.yang@intel.com>
Wed, 1 Jun 2011 17:26:44 +0000 (01:26 +0800)
committerYi Yang <yi.y.yang@intel.com>
Wed, 1 Jun 2011 17:26:44 +0000 (01:26 +0800)
commit392cfcf1f8b9f9efe8212bcbeaa8eb2f52a24878
treec0280dde74c399c114a69014d3aaac43e5aa3d43
parent26a1eba54bfea85666b042c5987d766ed1e8931b
parent1fffadeb57904d28c6c92cbb6e4a2030797ad04c
Merge branch 'master' into devel