Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Fri, 23 Jun 2006 20:46:23 +0000 (13:46 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 23 Jun 2006 20:46:23 +0000 (13:46 -0700)

Trivial merge