From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 13 Aug 2011 04:35:46 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1704
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=478267f9c45c912a8f44d58684aa53d783c21c34;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

478267f9c45c912a8f44d58684aa53d783c21c34