From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 20 Dec 2011 16:13:05 +0000 (-0600)
Subject: merge 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97193c1a1600141107e78c851058098404c73d62;p=python

merge 3.2
---

97193c1a1600141107e78c851058098404c73d62