]> granicus.if.org Git - python/commitdiff
Merge from 3.2.
authorEric V. Smith <eric@trueblade.com>
Wed, 16 May 2012 00:46:06 +0000 (20:46 -0400)
committerEric V. Smith <eric@trueblade.com>
Wed, 16 May 2012 00:46:06 +0000 (20:46 -0400)

Trivial merge