Merge branch 'resume-sci-force-bootparam' into release
Len Brown [Wed, 30 Dec 2009 23:32:32 +0000 (18:32 -0500)]

Trivial merge