http://hg.python.org/cpython/rev/d965366e5ebd changeset: 82647:d965366e5ebd parent: 82645:8e390e4784b0 parent: 82646:e470370b4701 user: Brett Cannon <brett at python.org> date: Wed Mar 13 11:02:29 2013 -0700 summary: merge files: -- Repository URL: http://hg.python.org/cpython