tree f9bef83da96592d7eeeaeb041ebcbd4363c954e2
parent 5c2b09e856555e34128113ac99758a776f66ce3c
parent 52e61449e39b6778d907c65fb2931a2d37c7eef2
author Benjamin Peterson <benjamin@python.org> 1306895929 -0500
committer Benjamin Peterson <benjamin@python.org> 1306895929 -0500

merge 3.1