Merge branch 'thermal-regression' into release

This commit is contained in:
Len Brown 2009-04-24 01:34:45 -04:00
commit 771e5ce3bd