From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 30 Jul 2011 15:00:02 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1800
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f94febd74fbc85b246dd9dc8108f142cbd26114;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

7f94febd74fbc85b246dd9dc8108f142cbd26114