From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Fri, 19 Aug 2011 16:43:43 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v2.7.3rc1~503
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da5a9622f135d17ca3a15069a738ac7419dfab42;p=python

merge heads
---

da5a9622f135d17ca3a15069a738ac7419dfab42