http://hg.python.org/cpython/rev/2f688a51b37b changeset: 85396:2f688a51b37b parent: 85395:b6d1aa14c419 parent: 85392:748a5d39e7ce user: Charles-François Natali <cf.natali at gmail.com> date: Sun Aug 25 18:29:16 2013 +0200 summary: Merge. files: -- Repository URL: http://hg.python.org/cpython