From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 21 Jan 2014 05:02:17 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0b3~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a67a79da244020ff98e00a4221ca79e8cf44afea;p=python

Merge with 3.3
---

a67a79da244020ff98e00a4221ca79e8cf44afea