From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 5 Nov 2013 02:44:17 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0b1~392
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1bd2fef8b542c9976a4b31cc3290dc93aaff794;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.3
---

c1bd2fef8b542c9976a4b31cc3290dc93aaff794