From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 May 2011 21:29:50 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.2.1rc2~131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=200fe3d747fe8da9a5043632dad435b33c492439;p=python

merge heads
---

200fe3d747fe8da9a5043632dad435b33c492439