From: Barry Warsaw <barry@python.org>
Date: Tue, 25 Sep 2012 14:48:25 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.1rc1~818^2^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=296b21a479f300b7622dde6badabc312043177dd;p=python

merge
---

296b21a479f300b7622dde6badabc312043177dd