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
........