Merge and resolve Misc/NEWS.

diff --cc Misc/NEWS
index 90e402b75770961f9da6a97ca058742bd833c37e,85ec6d6c10764c3330310982317aa3a19d3e8958..018c62d8c8b2b5b539ef7f684d070b428dbcf981
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -68,9 -68,12 +68,15 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #11289: `smtp.SMTP` class becomes a context manager so it can be used
 +  in a `with` statement.  Contributed by Giampaolo Rodola.
 +
+ - 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.