Pull error-inject into release branch
authorTony Luck <tony.luck@intel.com>
Mon, 30 Apr 2007 20:55:43 +0000 (13:55 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 30 Apr 2007 20:55:43 +0000 (13:55 -0700)

Trivial merge