From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Sep 2012 15:23:09 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~818^2^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b7ebafe6597b130463a684795109a6ef38e3eb6;p=python

merge heads
---

8b7ebafe6597b130463a684795109a6ef38e3eb6