From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 17 Oct 2011 17:10:24 +0000 (-0400)
Subject: merge 3.2 (#13199)
X-Git-Tag: v3.3.0a1~1153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=897d05922102ff499d17b063e6f59ed1770091dc;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#13199)
---

897d05922102ff499d17b063e6f59ed1770091dc