From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 11 Apr 2012 20:49:40 +0000 (-0400)
Subject: merge 3.2 (null)
X-Git-Tag: v3.3.0a3~253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d268109ae32bfadabc0ab75fcb4528f50fde5a87;p=python

merge 3.2 (null)
---

d268109ae32bfadabc0ab75fcb4528f50fde5a87