From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 12 Mar 2012 16:43:27 +0000 (-0700)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~234^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61a4161de4075918c1ad5f225498171290454e5d;p=python

merge 3.2
---

61a4161de4075918c1ad5f225498171290454e5d