Merged revisions 67937-67938 via svnmerge from

Merged revisions 67937-67938 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r67937 | alexandre.vassalotti | 2008-12-27 08:32:41 +0100 (Sat, 27 Dec 2008) | 3 lines

  Update copy of PyUnicode_EncodeRawUnicodeEscape in _pickle.
  Add astral character test case.
........
  r67938 | alexandre.vassalotti | 2008-12-27 10:09:15 +0100 (Sat, 27 Dec 2008) | 3 lines

  Fix wrong bytes type conversion in PyUnicode_AsUnicodeEscapeString.
  Fix wrong bytes type conversion in PyUnicode_AsUnicodeDecodeString.
........