From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 28 Oct 2011 23:44:00 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1037
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29037720d1391bca0e37851e053c85bb092d192e;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

29037720d1391bca0e37851e053c85bb092d192e