Merge branches 'bugzilla-15418', 'bugzilla-21722', 'bugzilla-22932', 'misc-2.6.37...
authorLen Brown <len.brown@intel.com>
Sat, 11 Dec 2010 07:02:02 +0000 (02:02 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 11 Dec 2010 07:02:02 +0000 (02:02 -0500)

Trivial merge