From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 3 Jul 2011 18:45:33 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1980
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92843e3c144b3a7a78e1c6b11ec85f06227c42ab;p=python

merge heads
---

92843e3c144b3a7a78e1c6b11ec85f06227c42ab