Merge branch 'linus' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:39:43 +0000 (03:39 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:39:43 +0000 (03:39 -0500)

Trivial merge