]> granicus.if.org Git - python/commitdiff
Merged upstream change.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Tue, 13 Mar 2012 12:18:55 +0000 (12:18 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Tue, 13 Mar 2012 12:18:55 +0000 (12:18 +0000)

Trivial merge