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

........
  r81454 | victor.stinner | 2010-05-22 00:50:28 +0200 (sam., 22 mai 2010) | 3 lines

  Issue #5640: Fix Shift-JIS incremental encoder for error handlers different
  than strict
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 6b97a3d..a427994 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -55,6 +55,9 @@
 Library
 -------
 
+- Issue #5640: Fix Shift-JIS incremental encoder for error handlers different
+  than strict
+
 - Issue #8782: Add a trailing newline in linecache.updatecache to the last line
   of files without one.