From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 30 Dec 2011 19:47:49 +0000 (-0600)
Subject: merge 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88cb2cafe9fc3fc2591a5248b9de8055efcf657d;p=python

merge 3.2
---

88cb2cafe9fc3fc2591a5248b9de8055efcf657d