From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 11 Apr 2014 18:11:34 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1908
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=138185fa054b5bd5fba925c7301aff7d912df25b;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

138185fa054b5bd5fba925c7301aff7d912df25b