Merge branch 'thermal' into release
Len Brown [Wed, 12 Jan 2011 10:00:44 +0000 (05:00 -0500)]

Trivial merge