Merge branch 'thermal-regression' into release
Len Brown [Fri, 24 Apr 2009 05:34:45 +0000 (01:34 -0400)]

Trivial merge