http://hg.python.org/cpython/rev/2db868824018 changeset: 75807:2db868824018 branch: 2.7 parent: 75791:ac00531a63aa parent: 75806:bd9e1a02e3e3 user: Barry Warsaw <barry at python.org> date: Sat Mar 17 18:23:22 2012 -0400 summary: null merge from 2.6 files: -- Repository URL: http://hg.python.org/cpython