From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 3 Jul 2011 18:32:17 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1981
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=774f83cda4df80ea259d836624a7c3d68ec66495;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

774f83cda4df80ea259d836624a7c3d68ec66495