Merge branch 'throttling' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:01:08 +0000 (05:01 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:01:08 +0000 (05:01 -0500)

Trivial merge