tree fcfa0f0e69304f1f69882b039d979afe5745fd8f
parent 6645f7e59022c7a30ef396c3e1851f92b974afe8
parent ef87f067982dede91aca3d7954b992b860d8a254
author Benjamin Peterson <benjamin@python.org> 1331570607 -0700
committer Benjamin Peterson <benjamin@python.org> 1331570607 -0700
HG:rename-source hg

merge 3.2