From: Brian Curtin <brian@python.org>
Date: Sat, 14 Apr 2012 19:20:29 +0000 (-0500)
Subject: merge with the tip
X-Git-Tag: v3.3.0a3~227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2217c46a5f314cce1bc78a0763ee866ab6481006;p=python

merge with the tip
---

2217c46a5f314cce1bc78a0763ee866ab6481006