From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 26 Mar 2012 02:41:06 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a2~51^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=533281dd4f979cf65d250e56a09ea94c364084dd;p=python

merge heads
---

533281dd4f979cf65d250e56a09ea94c364084dd