From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 24 Feb 2014 04:40:16 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.1rc1~233^2~221
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58719a7de780b3b13505658543cd80f65975fb7b;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.3
---

58719a7de780b3b13505658543cd80f65975fb7b