http://bugs.python.org/issue6971
Porting revision 75054 from trunk
2 files changed