From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 17 Mar 2012 05:05:59 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a2~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d845450eeff9f2c86de7ef950b67de7f6aedd0b1;p=python

merge heads
---

d845450eeff9f2c86de7ef950b67de7f6aedd0b1