From: Trent Nelson <trent@trent.me>
Date: Tue, 21 Aug 2012 23:48:55 +0000 (+0000)
Subject: Block 78699:019a2390b014, this needs to be manually merged.
X-Git-Tag: v3.3.0rc1~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dda5edc007ecc7a583daf2ca881b17c8d95b12f4;p=thirdparty%2FPython%2Fcpython.git

Block 78699:019a2390b014, this needs to be manually merged.
---

dda5edc007ecc7a583daf2ca881b17c8d95b12f4