Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Thu, 3 Nov 2005 17:09:08 +0000 (09:09 -0800)
committerTony Luck <tony.luck@intel.com>
Thu, 3 Nov 2005 17:09:08 +0000 (09:09 -0800)

Trivial merge