From: R David Murray <rdmurray@bitdance.com>
Date: Sun, 20 Mar 2011 15:19:20 +0000 (-0400)
Subject: Merge markup fixes for #7198 patch.
X-Git-Tag: v3.2.1b1~248
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38a04e51f60c6b7dfca354d37fb95cb0961c02c6;p=python

Merge markup fixes for #7198 patch.
---

38a04e51f60c6b7dfca354d37fb95cb0961c02c6