From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 15 May 2012 17:11:33 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.0a4~155^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4ec88e45aff7db22f1a4783092edd9c604cf793;p=python

merge heads
---

f4ec88e45aff7db22f1a4783092edd9c604cf793