From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 24 Oct 2011 12:52:30 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~1073
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4d8e912d7a9fd2f346aae5038c15f4f1f3dd411;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

b4d8e912d7a9fd2f346aae5038c15f4f1f3dd411