From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 22 Jul 2011 15:55:25 +0000 (-0500)
Subject: merge 3.2 (null)
X-Git-Tag: v3.3.0a1~1862
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51a6b371f924217246692c6e65a4b6617128e8a9;p=python

merge 3.2 (null)
---

51a6b371f924217246692c6e65a4b6617128e8a9