tree 4839f8d50529d34dde76dd22e9707884cf5b5968
parent e062ba48b6945ed0fa8be65d26ddbf88374293c0
author Benjamin Peterson <benjamin@python.org> 1290273985 +0000
committer Benjamin Peterson <benjamin@python.org> 1290273985 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release31-maint%4086588

Merged revisions 86587 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86587 | benjamin.peterson | 2010-11-20 11:24:04 -0600 (Sat, 20 Nov 2010) | 1 line

  correct logic when pos is after the string #10467
........