Merge branch 'misc-2.6.33' into release
authorLen Brown <len.brown@intel.com>
Thu, 24 Dec 2009 06:19:00 +0000 (01:19 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 24 Dec 2009 06:19:00 +0000 (01:19 -0500)

Trivial merge