Merge HEAD from ../from-linus
authorLen Brown <len.brown@intel.com>
Thu, 25 Aug 2005 16:45:49 +0000 (12:45 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 25 Aug 2005 16:45:49 +0000 (12:45 -0400)

Trivial merge