From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Sat, 7 Jul 2012 16:42:57 +0000 (+0200)
Subject: Merge with remote.
X-Git-Tag: v3.3.0b2~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5aa43542974c32b5a2a16acf42204e7a3cfcade9;p=python

Merge with remote.
---

5aa43542974c32b5a2a16acf42204e7a3cfcade9