From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 23 Feb 2014 05:37:46 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.1rc1~233^2~237
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9daee3eb0db9abaffda4586229dd7db801aabad;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.3
---

a9daee3eb0db9abaffda4586229dd7db801aabad