[Python-checkins] Would someone please help me merge these changes to other branches?

[skip at pobox.com]

I pushed two changes to cpython yesterday and today.  I don't know how to
merge them to the 2.7 and 3.2 branches, and don't want to even try for fear
of screwing something up.  If what I read in python-dev yesterday is
correct, I did things incorrectly by starting with cpython instead of 2.7 or
3.2.

Here are the changesets:

    http://hg.python.org/cpython/rev/c63d7374b89a
    http://hg.python.org/cpython/rev/592fd5b15639

There are other changesets, but they are all merge or conflict resolution
stuff and don't appear to be related to what I planned on being a simple
toe-in-the-water exercise in using Mercurial.  I don't know why they turned
up in the push.

Thanks,

Skip