Merge with linus
authorTony Luck <tony.luck@intel.com>
Tue, 17 May 2005 16:10:20 +0000 (09:10 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 17 May 2005 16:10:20 +0000 (09:10 -0700)

Trivial merge