Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release
authorLen Brown <len.brown@intel.com>
Thu, 14 Jul 2011 04:16:38 +0000 (00:16 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 14 Jul 2011 04:16:38 +0000 (00:16 -0400)

Trivial merge