Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Thu, 5 Jan 2006 16:52:11 +0000 (08:52 -0800)
committerTony Luck <tony.luck@intel.com>
Thu, 5 Jan 2006 16:52:11 +0000 (08:52 -0800)

Trivial merge