From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 10 Oct 2012 18:10:44 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.4.0a1~2287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b36a05094d16bfb86c1b113bcab769ca6dbeee7a;p=python

merge heads
---

b36a05094d16bfb86c1b113bcab769ca6dbeee7a