From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 23 Feb 2012 15:54:36 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~81^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4c90bdf202e9b6d088b7f5a38789b211d9d0a29;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

c4c90bdf202e9b6d088b7f5a38789b211d9d0a29