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

........
  r77680 | matthias.klose | 2010-01-22 01:39:04 +0100 (Fr, 22 Jan 2010) | 3 lines

  - Expat: Fix DoS via XML document with malformed UTF-8 sequences
    (CVE_2009_3560).
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 9d43874..2275be2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -169,6 +169,15 @@
 - Issue #5037: Proxy the __unicode__ special method to __unicode__ instead of
   __str__.
 
+Extension Modules
+-----------------
+
+- Expat: Fix DoS via XML document with malformed UTF-8 sequences
+  (CVE_2009_3560).
+
+Build
+-----
+>>>>>>> .merge-right.r77680
 Build
 -----