http://bugs.python.org/issue6836
Merging revisions 75103,75104 from trunk to py3k
4 files changed