From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 12 Mar 2011 17:59:10 +0000 (-0600)
Subject: merge 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32b01270077a2d1588a4119f8b976d4f53e245de;p=python

merge 3.2
---

32b01270077a2d1588a4119f8b976d4f53e245de