From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 17 Feb 2014 21:49:26 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.1rc1~233^2~306
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65429cf6395aa725021726e4adb21fb76e71caaa;p=python

Merge with 3.3
---

65429cf6395aa725021726e4adb21fb76e71caaa