Auto-update from upstream
authorTony Luck <tony.luck@intel.com>
Wed, 31 Aug 2005 21:19:44 +0000 (14:19 -0700)
committerTony Luck <tony.luck@intel.com>
Wed, 31 Aug 2005 21:19:44 +0000 (14:19 -0700)

Trivial merge