From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 24 Feb 2012 16:48:47 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6eaaeff00e43fe86ea2b832fdb9bf497eab742f7;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

6eaaeff00e43fe86ea2b832fdb9bf497eab742f7