From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 18 Feb 2014 04:12:37 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.1rc1~233^2~302
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79bf89986c6610b30b8c1dc3e4cc5195dc43c8eb;p=python

Merge with 3.3
---

79bf89986c6610b30b8c1dc3e4cc5195dc43c8eb