Merged revisions 72471 via svnmerge from

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

................
  r72471 | jeroen.ruigrok | 2009-05-08 16:18:00 +0200 (vr, 08 mei 2009) | 9 lines

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

  ........
    r72469 | jeroen.ruigrok | 2009-05-08 16:11:23 +0200 (vr, 08 mei 2009) | 2 lines

    Update the Windows locale mapping with the ones introduced with Vista.
  ........
................