Merged revisions 76943 via svnmerge from

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

................
  r76943 | mark.dickinson | 2009-12-20 19:56:09 +0000 (Sun, 20 Dec 2009) | 13 lines

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

  ........
    r76939 | mark.dickinson | 2009-12-20 19:45:37 +0000 (Sun, 20 Dec 2009) | 1 line

    Issue #7554:  Fix incorrect usage of rAssertAlmostEqual.  Thanks Florent Xicluna.
  ........
    r76941 | mark.dickinson | 2009-12-20 19:52:36 +0000 (Sun, 20 Dec 2009) | 1 line

    Fix for consistency with py3k keyword-only version of assertAlmostEqual
  ........
................