]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 20 Feb 2012 18:50:33 +0000 (18:50 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 20 Feb 2012 18:50:33 +0000 (18:50 +0000)

Trivial merge