From: Michael Foord <michael@python.org>
Date: Wed, 16 Mar 2011 21:28:51 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~2891^2~13^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b3181804227a5a4148fdf60b6655a989b45a8ff;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

4b3181804227a5a4148fdf60b6655a989b45a8ff