http://hg.python.org/cpython/rev/67cf2d067ce6 changeset: 85345:67cf2d067ce6 branch: 2.7 parent: 85331:1ea833ecaf5a parent: 85344:79007c4244d6 user: Barry Warsaw <barry at python.org> date: Fri Aug 23 13:38:02 2013 -0400 summary: null merge with 2.6 files: -- Repository URL: http://hg.python.org/cpython