tree 246457fd2c5b2bda15b701a74d38c8b85237fdbb
parent 2aa3af4a162e78714b7c4fceecc12fceab60e1bf
author Jean-Paul Calderone <exarkun@divmod.com> 1276977288 +0000
committer Jean-Paul Calderone <exarkun@divmod.com> 1276977288 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/py3k%4082089

merge forward from the python 2.x branch