From: Christian Heimes <christian@cheimes.de>
Date: Wed, 19 Jun 2013 00:09:00 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.4.0a1~449^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9a52f2625b66b031e8e6045f7a923aa85d7d3e5;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

d9a52f2625b66b031e8e6045f7a923aa85d7d3e5