From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 11 Sep 2012 16:05:18 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.1rc1~818^2^2~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=787269797e92e44d3edeab5d8dd0436170748e7e;p=python

merge heads
---

787269797e92e44d3edeab5d8dd0436170748e7e