From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 11 Nov 2012 18:41:09 +0000 (+0100)
Subject: Merge heads
X-Git-Tag: v3.4.0a1~2029
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05bc966490be9bfe62d906af7fa574547669dbc6;p=python

Merge heads
---

05bc966490be9bfe62d906af7fa574547669dbc6