http://bugs.python.org/issue6381
merging revision 73819 from trunk
3 files changed