Auto merge with /home/aegl/GIT/linus
authorTony Luck <tony.luck@intel.com>
Wed, 15 Jun 2005 21:06:48 +0000 (14:06 -0700)
committerTony Luck <tony.luck@intel.com>
Wed, 15 Jun 2005 21:06:48 +0000 (14:06 -0700)

Trivial merge