From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 6 Apr 2012 17:20:16 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~294^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=161aece9d3574c22d2585687db5cd4f33a76f052;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

161aece9d3574c22d2585687db5cd4f33a76f052