From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 29 Jan 2014 04:14:12 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0rc1~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d67650e24110832ba4b3742cf623a9d25a987d3a;p=python

Merge with 3.3
---

d67650e24110832ba4b3742cf623a9d25a987d3a