From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 6 Apr 2012 17:20:25 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a3~294^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=049208635d4bb55f757de7f599f73902748c8257;p=python

merge heads
---

049208635d4bb55f757de7f599f73902748c8257