Pull for-2.6.31 into release
authorTony Luck <tony.luck@intel.com>
Wed, 17 Jun 2009 16:35:24 +0000 (09:35 -0700)
committerTony Luck <tony.luck@intel.com>
Wed, 17 Jun 2009 16:35:24 +0000 (09:35 -0700)

Trivial merge