Auto merge with /home/aegl/GIT/linus
authorTony Luck <tony.luck@intel.com>
Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)
committerTony Luck <tony.luck@intel.com>
Wed, 13 Jul 2005 19:15:43 +0000 (12:15 -0700)

Trivial merge