From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 16 Mar 2013 20:03:37 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v2.7.4rc1~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e493e87f352033006edb5fb0b64158a77a870edb;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

e493e87f352033006edb5fb0b64158a77a870edb