Merged revisions 72776,72796 via svnmerge from

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

........
  r72776 | jeffrey.yasskin | 2009-05-18 14:14:54 -0700 (Mon, 18 May 2009) | 6 lines

  While I was modifying test_trace, it threw an exception when I accidentally
  made it try to set the line number from the trace callback for a 'call' event.
  This patch makes the error message a little more helpful in that case, and
  makes it a little less likely that a future editor will make the same mistake
  in test_trace.
........
  r72796 | jeffrey.yasskin | 2009-05-20 10:57:57 -0700 (Wed, 20 May 2009) | 3 lines

  Fix issue #1689458 by teaching frame_setlineno how to jump to the first line of
  a code object.
........