auto merge with /home/aegl/GIT/linus
authorTony Luck <tony.luck@intel.com>
Mon, 6 Jun 2005 22:42:07 +0000 (15:42 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 6 Jun 2005 22:42:07 +0000 (15:42 -0700)

Trivial merge