From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 27 Jun 2011 14:16:47 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2037
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16ba98cc289f210c8422c76fbc26a145da55511c;p=python

merge heads
---

16ba98cc289f210c8422c76fbc26a145da55511c