Merged revisions 83531 via svnmerge from

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

........
  r83531 | georg.brandl | 2010-08-02 19:24:49 +0200 (Mo, 02 Aug 2010) | 1 line

  #7372: fix regression in pstats: a previous fix to handle cProfile data in add_callers broke handling of profile data.
........