From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 18 Aug 2011 18:52:19 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1681
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e518d4c18a760a153fb381b38fe022b3c1b36096;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

e518d4c18a760a153fb381b38fe022b3c1b36096