From: Richard Oudkerk <shibturn@gmail.com>
Date: Mon, 10 Jun 2013 14:45:30 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0a1~538
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cac17b4d78fdc8ad617e59281160749c91665fb3;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

cac17b4d78fdc8ad617e59281160749c91665fb3