http://hg.python.org/cpython/rev/d62d107a61e7 changeset: 69787:d62d107a61e7 parent: 69785:2e3346fc880f parent: 69786:b312f8f512a9 user: Raymond Hettinger <python at rcn.com> date: Mon May 02 09:53:36 2011 -0700 summary: dummy merge files: -- Repository URL: http://hg.python.org/cpython