Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Fri, 12 Aug 2005 22:13:06 +0000 (15:13 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 12 Aug 2005 22:13:06 +0000 (15:13 -0700)

Trivial merge