From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 12 Mar 2012 16:28:51 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.0a2~234^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6645f7e59022c7a30ef396c3e1851f92b974afe8;p=python

merge heads
---

6645f7e59022c7a30ef396c3e1851f92b974afe8