Pull misc2634 into release branch

This commit is contained in:
Tony Luck 2010-02-26 12:04:32 -08:00
commit 4d86e1b18d
3 changed files with 4 additions and 26 deletions