Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Mon, 22 Aug 2005 21:31:36 +0000 (14:31 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 22 Aug 2005 21:31:36 +0000 (14:31 -0700)

Trivial merge