From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Oct 2011 04:04:10 +0000 (-0400)
Subject: merge 3.2 (#13259)
X-Git-Tag: v3.3.0a1~1072
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ed559a3c7530fa6d580a7f204d162a448cbb948;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#13259)
---

3ed559a3c7530fa6d580a7f204d162a448cbb948