From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 13 Oct 2012 15:58:23 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.4.0a1~2261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=174baa39f61d1512343359970996925652d65092;p=python

merge heads
---

174baa39f61d1512343359970996925652d65092