Pull misc2-6-36 into release branch

This commit is contained in:
Tony Luck 2010-08-04 08:53:02 -07:00
commit 9354a55f94
2 changed files with 200 additions and 184 deletions