From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 2 Jan 2013 18:23:32 +0000 (-0600)
Subject: merge heads
X-Git-Tag: v3.4.0a1~1707
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1ae518c64040b2c6800bb4622d06d56d30d1143;p=python

merge heads
---

d1ae518c64040b2c6800bb4622d06d56d30d1143