From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Oct 2011 04:07:05 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1070
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f602c556b7536107cbd774ecb2a55728988b1ef9;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

f602c556b7536107cbd774ecb2a55728988b1ef9