Pull misc-2.6.40 into release branch

This commit is contained in:
Tony Luck 2011-05-20 10:35:03 -07:00
commit 5e4de22bec