Merged revisions 68814-68815 via svnmerge from

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

........
  r68814 | mark.dickinson | 2009-01-20 20:43:58 +0000 (Tue, 20 Jan 2009) | 5 lines

  Issue #4842, patch 1/2: fix pickle in Python 3.x so that pickling with the
  'L' opcode always appends an 'L' on output, just as 2.x does.  When
  unpickling, remove the trailing 'L' (if present) before passing the
  result to PyLong_FromString.
........
  r68815 | mark.dickinson | 2009-01-20 20:45:53 +0000 (Tue, 20 Jan 2009) | 2 lines

  Issue 4842, patch 2/2:  int('3L') should be invalid in Python 3.x.
........