From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 10 Feb 2013 14:32:22 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.4.0a1~1404
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b466c99329c0d422a48acfae0c20ec1e76ef314;p=python

merge heads
---

8b466c99329c0d422a48acfae0c20ec1e76ef314