From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 16 Mar 2013 22:39:42 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.4.0a1~1188
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2481899acd63a0f041ccc397f9af5dd691384ed9;p=python

merge heads
---

2481899acd63a0f041ccc397f9af5dd691384ed9