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

merge heads
---

d47f0d6d1b8f1eb125fb8a831ad80c125a96bd4a