Merge branch 'eeepc-laptop' into release
Len Brown [Wed, 20 Jan 2010 06:23:01 +0000 (01:23 -0500)]

Trivial merge