Merge branches 'misc', 'eeepc-laptop' and 'bugzilla-14445' into release
Len Brown [Thu, 5 Nov 2009 23:31:18 +0000 (18:31 -0500)]

Trivial merge