Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Tue, 1 Nov 2005 00:03:46 +0000 (16:03 -0800)
committerTony Luck <tony.luck@intel.com>
Tue, 1 Nov 2005 00:03:46 +0000 (16:03 -0800)

Trivial merge