From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 9 Oct 2012 15:16:26 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~815
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=455fa0a314b7f7edd0c8554b12a65267ff1e2e5b;p=python

merge heads
---

455fa0a314b7f7edd0c8554b12a65267ff1e2e5b