From: R David Murray <rdmurray@bitdance.com>
Date: Sun, 20 Mar 2011 14:27:48 +0000 (-0400)
Subject: Dummy merge #7198
X-Git-Tag: v3.3.0a1~2843
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb887965f72d1737404a6224bf9e71d78df2cfbd;p=python

Dummy merge #7198

Changeset ab27f16f707a was messed up by a rebase (as were
959f666470cc and 9d1b1a95bc8f) and the patch only got applied
to default.
---

eb887965f72d1737404a6224bf9e71d78df2cfbd