From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 6 Feb 2012 16:29:05 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.2.3rc1~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f30575713a153d5b3c558de6068bdfe1dd1a3f4;p=python

merge heads
---

1f30575713a153d5b3c558de6068bdfe1dd1a3f4