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)

Trivial merge