Merged revisions 82799 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82799 | georg.brandl | 2010-07-11 11:26:57 +0200 (So, 11 Jul 2010) | 1 line

  Fix typo.
........

Doc/whatsnew/2.7.rst

@@ -144,7 +144,7 @@ A partial list of 3.1 features that were backported to 2.7:
 * Float-to-string and string-to-float conversions now round their
   results more correctly, and :func:`repr` of a floating-point
   number *x* returns a result that's guaranteed to round back to the
-  same number when converted back to a string.
+  same number when converted back to a float.
 * The :ctype:`PyCapsule` type, used to provide a C API for extension modules.
 * The :cfunc:`PyLong_AsLongAndOverflow` C API function.