Merge branch 'bugfix-thermal' into release

This commit is contained in:
Len Brown 2011-03-23 02:33:46 -04:00
commit 797b10a070