From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 Jan 2012 14:06:45 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~312
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8485ad1410f790abbd3bb2c019b4657241586f57;p=python

merge heads
---

8485ad1410f790abbd3bb2c019b4657241586f57