From: Nick Coghlan <ncoghlan@gmail.com>
Date: Mon, 5 Nov 2012 10:40:57 +0000 (+1000)
Subject: Merge from 3.3
X-Git-Tag: v3.4.0a1~2073
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82de6d20de3ba0a198a10bc4956ad8c7f240245e;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3
---

82de6d20de3ba0a198a10bc4956ad8c7f240245e