Merged revisions 72376 via svnmerge from

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

................
  r72376 | jeroen.ruigrok | 2009-05-06 07:33:24 +0200 (wo, 06 mei 2009) | 12 lines

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

  ........
    r72375 | jeroen.ruigrok | 2009-05-06 07:25:42 +0200 (wo, 06 mei 2009) | 5 lines

    Wrap getpreferredencoding()'s use of setlocale in a try/except to prevent
    us from raising an exception when the locale is invalid.

    Issue #1443504
  ........
................