From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 1 Jan 2012 04:42:45 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v3.2.3rc1~227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c40d362a1cd6c36635e91b6c7e7dbf3337b55562;p=python

merge heads
---

c40d362a1cd6c36635e91b6c7e7dbf3337b55562