http://hg.python.org/cpython/rev/578d5ae1c8eb changeset: 81431:578d5ae1c8eb parent: 81429:e3d47d5b9110 parent: 81430:9c695fddd10a user: Brett Cannon <brett at python.org> date: Fri Jan 11 15:44:57 2013 -0500 summary: merge files: -- Repository URL: http://hg.python.org/cpython