Merge branch 'thinkpad' into release
authorLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:11:06 +0000 (02:11 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 19 Sep 2009 06:11:06 +0000 (02:11 -0400)

Trivial merge