Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Fri, 28 Oct 2005 22:28:54 +0000 (15:28 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 28 Oct 2005 22:28:54 +0000 (15:28 -0700)

Trivial merge