Auto merge with /home/aegl/GIT/linus
authorTony Luck <tony.luck@intel.com>
Tue, 21 Jun 2005 23:21:20 +0000 (16:21 -0700)
committerTony Luck <tony.luck@intel.com>
Tue, 21 Jun 2005 23:21:20 +0000 (16:21 -0700)

Trivial merge