Merge branch 'eeepc-laptop' into release
Len Brown [Thu, 15 Oct 2009 04:46:46 +0000 (00:46 -0400)]

Trivial merge