Pull misc2634 into release branch
authorTony Luck <[email protected]>
Fri, 26 Feb 2010 20:04:32 +0000 (12:04 -0800)
committerTony Luck <[email protected]>
Fri, 26 Feb 2010 20:04:32 +0000 (12:04 -0800)

Trivial merge