From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 3 Jan 2012 22:30:47 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~482
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=199808b796f0b8964796c7279d8e7f11f4b7480b;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

199808b796f0b8964796c7279d8e7f11f4b7480b