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.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index b3166e2..624c465 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,6 +84,9 @@
 Library
 -------
 
+- Issue #7372: Fix pstats regression when stripping paths from profile
+  data generated with the profile module.
+
 - Issue #4108: In urllib.robotparser, if there are multiple 'User-agent: *'
   entries, consider the first one.