Merge branch 'master' into devel
authorZhang Qiang <qiang.z.zhang@intel.com>
Thu, 28 Jun 2012 11:28:53 +0000 (19:28 +0800)
committerZhang Qiang <qiang.z.zhang@intel.com>
Thu, 28 Jun 2012 11:28:53 +0000 (19:28 +0800)
commitcaad87a28d17de8437608f5fed40d335653d2562
tree79d403606a79fd548706f2e49b17443c67493917
parentef407f9d5a4c163d5d86cbabe84c423a246f2610
parent7ef5aee66f88b65f5fb92cae980160ec2ab62c36
Merge branch 'master' into devel