Pull misc2-6-36 into release branch
authorTony Luck <tony.luck@intel.com>
Wed, 4 Aug 2010 15:53:02 +0000 (08:53 -0700)
committerTony Luck <tony.luck@intel.com>
Wed, 4 Aug 2010 15:53:02 +0000 (08:53 -0700)

Trivial merge