From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 19 Oct 2011 20:58:15 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc37ce95e8979d5d9e9c0777910bf94080d29115;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

dc37ce95e8979d5d9e9c0777910bf94080d29115