tree 6af14e6df63d26fc1c13b1a4e140e9d1682e1a29
parent 3a3bb211c82233b6cce9e7ad3cfea7207994a66d
author Tim Peters <tim.peters@gmail.com> 995404244 +0000
committer Tim Peters <tim.peters@gmail.com> 995404244 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4021856

Kill another merge zombie.