tree 671c8ca764d00e25dc77dcadc9cf036f1c52519a
parent ed233460d87c6b3ef9a88e1b903a66862d54f073
author Anthony Baxter <anthonybaxter@gmail.com> 1112112336 +0000
committer Anthony Baxter <anthonybaxter@gmail.com> 1112112336 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4038737

merge from branch