Merged revisions 68553 via svnmerge from

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

........
  r68553 | mark.dickinson | 2009-01-12 20:49:19 +0000 (Mon, 12 Jan 2009) | 8 lines

  Issue #4910 (1st patch of a series):  fix int() and the corresponding
  PyNumber_Int/PyNumber_Long API function so that it no longer attempts
  to call the __long__ method for conversion.  Only the __int__ and __trunc__
  methods are used.  (This removes a major remaining use of the nb_long
  slot from the Python 3.x core.)

  Thanks Benjamin for review.
........