Merge branch 'thinkpad' into release
authorLen Brown <len.brown@intel.com>
Sun, 2 Aug 2009 15:34:24 +0000 (11:34 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 2 Aug 2009 15:34:24 +0000 (11:34 -0400)

Trivial merge