From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 23 Feb 2012 15:48:22 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~81^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea1cb7a9c32f382fef3d4f3b89e0f08d314adc44;p=python

merge 3.2
---

ea1cb7a9c32f382fef3d4f3b89e0f08d314adc44