tree 0e15f7a9733e30f544e8922470f317fb7a0dccb3
parent dcca98d483f8a86c187c4d72f2e220a56ed0a1c0
author Christian Heimes <christian@cheimes.de> 1203960812 +0000
committer Christian Heimes <christian@cheimes.de> 1203960812 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/py3k%4061066

svnmerge.py block -r 61065