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

Trivial merge