From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 24 Oct 2011 12:52:30 +0000 (-0400)
Subject: merge 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4d8e912d7a9fd2f346aae5038c15f4f1f3dd411;p=python

merge 3.2
---

b4d8e912d7a9fd2f346aae5038c15f4f1f3dd411