Merge ../to-linus-stable/
authorLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)

Trivial merge