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

merge heads
---

f2f2bfee8af22385300b9dca1d10d1f26bc47034