From: Charles-François Natali <cf.natali@gmail.com>
Date: Sat, 31 Aug 2013 15:32:30 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.4.0a2~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08548f4a750b6f378c58decdcaf2ac6778103fe1;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

08548f4a750b6f378c58decdcaf2ac6778103fe1