Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Thu, 18 Aug 2005 23:44:15 +0000 (16:44 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 18 Aug 2005 23:44:15 +0000 (16:44 -0700)

Trivial merge