From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 Apr 2012 17:50:05 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a3~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bc36530831b3b59b68b0579aeb01cd27ea36c20;p=python

merge heads
---

9bc36530831b3b59b68b0579aeb01cd27ea36c20