Merged revisions 69808 via svnmerge from

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

................
  r69808 | eric.smith | 2009-02-20 09:25:03 -0500 (Fri, 20 Feb 2009) | 9 lines

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

  ........
    r69806 | eric.smith | 2009-02-20 09:02:36 -0500 (Fri, 20 Feb 2009) | 1 line

    Issue #5247: Improve error message when unknown format codes are used when using str.format() with str, int, and float arguments.
  ........
................