merge linus into release branch
authorLen Brown <len.brown@intel.com>
Mon, 19 Jun 2006 22:01:24 +0000 (18:01 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 19 Jun 2006 22:01:24 +0000 (18:01 -0400)

Trivial merge