]> granicus.if.org Git - python/commitdiff
Merge with hg.python.org.
authorReid Kleckner <reid@kleckner.net>
Mon, 14 Mar 2011 23:34:13 +0000 (19:34 -0400)
committerReid Kleckner <reid@kleckner.net>
Mon, 14 Mar 2011 23:34:13 +0000 (19:34 -0400)

Trivial merge