From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 9 Apr 2012 19:05:13 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a3~269^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77ec32655e6e599ba8f97ec9b46b1da38f2b9515;p=python

merge heads
---

77ec32655e6e599ba8f97ec9b46b1da38f2b9515