From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 15 Aug 2013 18:32:46 +0000 (-0400)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a2~218
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=102bdbcaa7c2927054f3f9756de3f0857016b907;p=python

Merge with 3.3
---

102bdbcaa7c2927054f3f9756de3f0857016b907