From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 13 Apr 2012 22:06:42 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~236
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=780b66b3e6019485959aeac9ab7fb30e14c53825;p=python

merge 3.2
---

780b66b3e6019485959aeac9ab7fb30e14c53825