From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 16 Mar 2012 23:22:53 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a2~141^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29a837d8575d581c99e8626a3eda8c0e10888cac;p=python

merge heads
---

29a837d8575d581c99e8626a3eda8c0e10888cac