Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Tue, 30 Aug 2005 16:30:09 +0000 (09:30 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 30 Aug 2005 16:30:09 +0000 (09:30 -0700)

Trivial merge