From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 16 Mar 2011 15:29:37 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2891^2~13^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09bb8f46aa08fdcc4ec4b7c791d550fd71ae9f60;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

09bb8f46aa08fdcc4ec4b7c791d550fd71ae9f60