From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 2 Aug 2011 23:49:38 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~1761
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05cd4c602b4f16606dd046dfad51f1d0465d9d85;p=python

merge heads
---

05cd4c602b4f16606dd046dfad51f1d0465d9d85