]> granicus.if.org Git - python/commitdiff
Merge heads.
authorEric V. Smith <eric@trueblade.com>
Mon, 12 Mar 2012 22:29:06 +0000 (15:29 -0700)
committerEric V. Smith <eric@trueblade.com>
Mon, 12 Mar 2012 22:29:06 +0000 (15:29 -0700)

Trivial merge