Pull misc2634 into release branch
authorTony Luck <tony.luck@intel.com>
Fri, 26 Feb 2010 20:04:32 +0000 (12:04 -0800)
committerTony Luck <tony.luck@intel.com>
Fri, 26 Feb 2010 20:04:32 +0000 (12:04 -0800)

Trivial merge