From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 9 Apr 2012 19:05:47 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~269^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a1e7cb06c09c7c7146b4c8a3f35419c379a1143;p=python

merge 3.2
---

4a1e7cb06c09c7c7146b4c8a3f35419c379a1143