Merged revisions 78896 via svnmerge from

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

................
  r78896 | ezio.melotti | 2010-03-13 03:28:34 +0200 (Sat, 13 Mar 2010) | 9 lines

  Merged revisions 78895 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78895 | ezio.melotti | 2010-03-13 03:21:34 +0200 (Sat, 13 Mar 2010) | 1 line

    #8011: use exc.tb_lineno instead of traceback.tb_lineno() and pep8ify variable names.
  ........
................