Merged revisions 77550 via svnmerge from

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

........
  r77550 | mark.dickinson | 2010-01-16 20:33:02 +0000 (Sat, 16 Jan 2010) | 1 line

  Add better error reporting for MemoryErrors caused by str->float conversions.
........