tree a5421e1e085843fa238260f7f80077b7904aebb7
parent ec1c030aad76568c358363a8fb6444edf82bdcad
parent 82d8ec5eef84c54bd5b56dece42b5ceb74e6b8db
author Georg Brandl <georg@python.org> 1300694131 +0100
committer Georg Brandl <georg@python.org> 1300694131 +0100

Merge to 3.2.