From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 Jan 2012 21:31:56 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~304
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5f6d0e030e11b84e9e952f6ce688b32f232dda3;p=python

merge 3.2
---

a5f6d0e030e11b84e9e952f6ce688b32f232dda3