From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 22 Jan 2014 02:13:25 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0b3~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45726d3011ab00c0c223fd0a4e93ae7135ba66bf;p=python

Merge with 3.3
---

45726d3011ab00c0c223fd0a4e93ae7135ba66bf