From: Trent Nelson <trent@trent.me>
Date: Tue, 16 Oct 2012 15:10:40 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v2.7.4rc1~478
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce5a56e9851a65a94b24b27ec6e55d4c47d7e46c;p=thirdparty%2FPython%2Fcpython.git

Merge heads.
---

ce5a56e9851a65a94b24b27ec6e55d4c47d7e46c