From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 16 Mar 2012 15:13:30 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a2~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49f0b70906d0a42c274cb3957ab58bd85e5f4898;p=python

merge heads
---

49f0b70906d0a42c274cb3957ab58bd85e5f4898