From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Mon, 14 Apr 2008 22:46:41 +0000 (+0000)
Subject: Recorded merge of revisions 62345 via svnmerge from
X-Git-Tag: v3.0a5~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6372b94a5a240da980a7973dc693e4998978edb;p=thirdparty%2FPython%2Fcpython.git

Recorded merge of revisions 62345 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62345 | alexandre.vassalotti | 2008-04-14 18:40:08 -0400 (Mon, 14 Apr 2008) | 2 lines

  Backport manually r62342 from the py3k branch to the trunk.
........
---