From: R David Murray <rdmurray@bitdance.com>
Date: Sun, 23 Jun 2013 20:12:32 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v2.7.6rc1~338
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65e27fccdc8b0dadd064a7977f0249e07408d656;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

65e27fccdc8b0dadd064a7977f0249e07408d656