Merged revisions 72719 via svnmerge from

Merged revisions 72719 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72719 | mark.dickinson | 2009-05-17 11:40:10 +0100 (Sun, 17 May 2009) | 10 lines

  Merged revisions 72718 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r72718 | mark.dickinson | 2009-05-17 11:38:30 +0100 (Sun, 17 May 2009) | 4 lines

    Issue #6044: remove confusing wording from complex -> integer and
    complex -> float conversion error messages.
  ........
................