tree a33bdb7d8be9471d4844532946b2e4284edd01a8
parent e32d99fb0677a1a98e486186a7651f154979e3d7
author R. David Murray <rdmurray@bitdance.com> 1260811628 +0000
committer R. David Murray <rdmurray@bitdance.com> 1260811628 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/py3k%4076834

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

........
  r76819 | benjamin.peterson | 2009-12-13 16:15:31 -0500 (Sun, 13 Dec 2009) | 1 line

  avoid having to update this statement all the time
........
  r76830 | r.david.murray | 2009-12-13 21:50:32 -0500 (Sun, 13 Dec 2009) | 2 lines

  Clarify phrasing that explains that there are currently two branches.
........