Merge #11554 test_email_codecs activation from 3.2.

diff --cc Lib/email/test/test_email.py
Simple merge

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index f9c4c9e1f46efb32bc70f70118056743f92dc549,adc719bf2f5e1753ffcfb43e30240e4e498798cf..85ec6d6c10764c3330310982317aa3a19d3e8958
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -68,12 -34,9 +68,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11554: Fixed support for Japanese codecs; previously the body output
+   encoding was not done if euc-jp or shift-jis was specified as the charset.
+ 
 +- Issue #11509: Significantly increase test coverage of fileinput.
 +  Patch by Denver Coneybeare at PyCon 2011 Sprints.
 +
 +- Issue #11407: `TestCase.run` returns the result object used or created.
 +  Contributed by Janathan Hartley.
 +
  - Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified 
    IP addresses in the proxy exception list. 
  
@@@ -206,8 -102,8 +209,10 @@@ Tools/Demo
  Tests
  -----
  
+ - Issue #11554: Reactivated test_email_codecs.
+ 
 +- Issue #11505: improves test coverage of string.py
 +
  - Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a
    false positive if the last directory in the path is inaccessible.