Merged revisions 81417 via svnmerge from

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

................
  r81417 | benjamin.peterson | 2010-05-21 15:55:22 -0500 (Fri, 21 May 2010) | 9 lines

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

  ........
    r81414 | benjamin.peterson | 2010-05-21 15:51:45 -0500 (Fri, 21 May 2010) | 1 line

    return NotImplemented from Mapping when comparing to a non-mapping #8729
  ........
................