http://hg.python.org/cpython/rev/0fd148c04e57 changeset: 70635:0fd148c04e57 branch: 2.7 parent: 70630:53912b58eee6 parent: 70634:3c4d84403bcf user: Barry Warsaw <barry at python.org> date: Fri Jun 03 20:07:41 2011 -0400 summary: Null merge from 2.6. files: -- Repository URL: http://hg.python.org/cpython