Merged revisions 83354,83365 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r83354 | georg.brandl | 2010-07-31 21:07:37 +0200 (Sa, 31 Jul 2010) | 1 line

  #9328: string format methods return strings.
........
  r83365 | georg.brandl | 2010-07-31 23:22:36 +0200 (Sa, 31 Jul 2010) | 1 line

  #1019882: if start() and stop() were not in the same stack frame, stats.load() would crash with IndexError.
........
4 files changed