Blocked revisions 81871 via svnmerge

........
  r81871 | victor.stinner | 2010-06-10 15:36:23 +0200 (jeu., 10 juin 2010) | 4 lines

  Fix r81869: ISO-8859-15 was seen as an alias to ISO-8859-1

  Don't use normalize_encoding() result if it is truncated.
........