http://hg.python.org/cpython/rev/cb9c780a7c1a changeset: 85293:cb9c780a7c1a branch: 2.7 parent: 85292:2e6aa6c29be2 parent: 85286:da5b216916a3 user: Christian Heimes <christian at cheimes.de> date: Wed Aug 21 13:43:20 2013 +0200 summary: merge files: -- Repository URL: http://hg.python.org/cpython