Merge branch 'thinkpad-2.6.32' into release
authorLen Brown <len.brown@intel.com>
Wed, 25 Nov 2009 05:43:08 +0000 (00:43 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 25 Nov 2009 05:43:08 +0000 (00:43 -0500)

Trivial merge