From: Brian Curtin <brian@python.org>
Date: Thu, 21 Jun 2012 21:36:05 +0000 (-0500)
Subject: branch merge
X-Git-Tag: v3.3.0b1~168^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe078f79207be3526ec488dee2a85f29fe530edd;p=python

branch merge
---

fe078f79207be3526ec488dee2a85f29fe530edd