Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Tue, 16 Aug 2005 18:29:57 +0000 (11:29 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 16 Aug 2005 18:29:57 +0000 (11:29 -0700)

Trivial merge