]> granicus.if.org Git - python/commitdiff
Merge from 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 10 Mar 2011 11:54:21 +0000 (13:54 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 10 Mar 2011 11:54:21 +0000 (13:54 +0200)

Trivial merge