From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 23 Aug 2014 22:22:43 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.4.2rc1~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=130f303ba5f5a0f2f8d8c90dbba2358374d26248;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

130f303ba5f5a0f2f8d8c90dbba2358374d26248