Merge branch 'thinkpad' into release
authorLen Brown <[email protected]>
Wed, 30 Dec 2009 07:51:05 +0000 (02:51 -0500)
committerLen Brown <[email protected]>
Wed, 30 Dec 2009 07:51:05 +0000 (02:51 -0500)

Trivial merge