From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 15 Mar 2012 18:57:38 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.1.5rc2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7536c4ff5d0ec6924a135004a53b9f0463f3480;p=python

merge heads
---

c7536c4ff5d0ec6924a135004a53b9f0463f3480