Auto merge with /home/aegl/GIT/ia64-test
authorTony Luck <tony.luck@intel.com>
Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 28 Jun 2005 15:24:49 +0000 (08:24 -0700)

Trivial merge