Merged revisions 75212,75214 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r75212 | benjamin.peterson | 2009-10-03 10:06:21 -0500 (Sat, 03 Oct 2009) | 1 line

  revert r75090
........
  r75214 | benjamin.peterson | 2009-10-03 10:13:15 -0500 (Sat, 03 Oct 2009) | 1 line

  isinstance(f, collections.Callable) is more correct
........