Merged revisions 78045 via svnmerge from

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

................
  r78045 | mark.dickinson | 2010-02-06 23:16:50 +0000 (Sat, 06 Feb 2010) | 9 lines

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

  ........
    r78041 | mark.dickinson | 2010-02-06 23:11:25 +0000 (Sat, 06 Feb 2010) | 1 line

    testCopysign was defined twice in test_math;  combine the definitions
  ........
................