From: Georg Brandl <georg@python.org>
Date: Fri, 14 Aug 2009 08:15:41 +0000 (+0000)
Subject: Recorded merge of revisions 74443 via svnmerge from
X-Git-Tag: v3.1.1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43226f8bd0582e33810043d4f350f3d8d4a6e7c8;p=python

Recorded merge of revisions 74443 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r74443 | georg.brandl | 2009-08-14 10:12:14 +0200 (Fr, 14 Aug 2009) | 12 lines

  Recorded merge of revisions 74429 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74429 | brett.cannon | 2009-08-13 21:27:12 +0200 (Do, 13 Aug 2009) | 5 lines

    Expat could crash if given the wrong kind of input by never stopping its
    tokenizing step.

    Thanks to Ivan Krstić for the patch.
  ........
................
---