tree f0314ae44e5bb750236aa81d6e0c6313098c0efe
parent 6ae7a7d13d2f1497b197f7d1c798536e3abd8b7a
author Jesse Noller <jnoller@gmail.com> 1238431056 +0000
committer Jesse Noller <jnoller@gmail.com> 1238431056 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/py3k%4070724

Merge 70717 to 30maint