From: Brian Curtin <brian@python.org>
Date: Thu, 27 Dec 2012 20:14:42 +0000 (-0600)
Subject: another merge
X-Git-Tag: v3.3.1rc1~473
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9640ead585cf7d95e961dd26c110f94c034657d7;p=python

another merge
---

9640ead585cf7d95e961dd26c110f94c034657d7