Auto merge with /home/aegl/GIT/linus
authorTony Luck <tony.luck@intel.com>
Fri, 15 Jul 2005 23:59:00 +0000 (16:59 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 15 Jul 2005 23:59:00 +0000 (16:59 -0700)

Trivial merge