tree 1c912113e26aaddfae4bbe91b38152828b6eaffd
parent 4ce881e928fc2dfd15a4ffafcf59ed71e51f2d24
author Benjamin Peterson <benjamin@python.org> 1269559820 +0000
committer Benjamin Peterson <benjamin@python.org> 1269559820 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/py3k%4079429

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

........
  r79428 | benjamin.peterson | 2010-03-25 18:27:16 -0500 (Thu, 25 Mar 2010) | 1 line

  make naming convention consistent
........