From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 12 Jan 2012 07:09:15 +0000 (+0100)
Subject: Merge
X-Git-Tag: v2.7.3rc1~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d047e85b71bb8fc02c3f28dd8d8be750d100879;p=python

Merge
---

2d047e85b71bb8fc02c3f28dd8d8be750d100879