Merged revisions 68175 via svnmerge from

Merged revisions 68175 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r68175 | martin.v.loewis | 2009-01-02 21:47:48 +0100 (Fri, 02 Jan 2009) | 13 lines

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

  ........
    r68172 | martin.v.loewis | 2009-01-02 21:32:55 +0100 (Fr, 02 Jan 2009) | 2 lines

    Issue #4075: Use OutputDebugStringW in Py_FatalError.
  ........
    r68173 | martin.v.loewis | 2009-01-02 21:40:14 +0100 (Fr, 02 Jan 2009) | 2 lines

    Issue #4051: Prevent conflict of UNICODE macros in cPickle.
  ........
................