Recorded merge of revisions 74443 via svnmerge from
commit4299f68afc1417f678e1ab9e05ba0b678abe9d0d
authorgeorg.brandl <georg.brandl@6015fed2-1504-0410-9fe1-9d1591cc4771>
Fri, 14 Aug 2009 08:15:41 +0000 (14 08:15 +0000)
committergeorg.brandl <georg.brandl@6015fed2-1504-0410-9fe1-9d1591cc4771>
Fri, 14 Aug 2009 08:15:41 +0000 (14 08:15 +0000)
treeb18f0a315c6da64d074a30a30250e43c522123cd
parent491843e080c326617d33ad2c94342014ff5f9c80
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.
  ........
................

git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@74444 6015fed2-1504-0410-9fe1-9d1591cc4771