Merged revisions 77290 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77290 | antoine.pitrou | 2010-01-03 23:38:50 +0100 (dim., 03 janv. 2010) | 3 lines

  Credit Nir Aides for r77288
........