From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 Jan 2012 14:07:15 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a10999d55c93aa7bccc2b87ca81a336b20459bcd;p=python

merge 3.2
---

a10999d55c93aa7bccc2b87ca81a336b20459bcd