Merged revisions 81953 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81953 | benjamin.peterson | 2010-06-12 12:47:06 -0500 (Sat, 12 Jun 2010) | 1 line

  fix warning with ucs4
........