From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 7 Aug 2012 00:53:19 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.3.0b2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ed05059ded079b1c239187e9cc1bee37cf9bead;p=python

merge heads
---

0ed05059ded079b1c239187e9cc1bee37cf9bead