Auto merge with /home/aegl/GIT/linus
authorTony Luck <tony.luck@intel.com>
Wed, 6 Jul 2005 22:35:18 +0000 (15:35 -0700)
committerTony Luck <tony.luck@intel.com>
Wed, 6 Jul 2005 22:35:18 +0000 (15:35 -0700)

Trivial merge