Backport of fixes from py3k branch
svn merge -r59131:HEAD ../../py3k/PCbuild9/ .
2 files changed