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.
........