From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 4 Aug 2012 14:17:10 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.3.0b2~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8aaeb2f4dcb0e0b01ab69b1f28de527b8f579e96;p=thirdparty%2FPython%2Fcpython.git

Merge
---

8aaeb2f4dcb0e0b01ab69b1f28de527b8f579e96