From: Christian Heimes <christian@cheimes.de>
Date: Sat, 17 Aug 2013 13:02:55 +0000 (+0200)
Subject: merge 2.7
X-Git-Tag: v2.7.6rc1~230
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b37327b18c8378a8a631b9b37f4bb99bac4e917c;p=thirdparty%2FPython%2Fcpython.git

merge 2.7
---

b37327b18c8378a8a631b9b37f4bb99bac4e917c