]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 9 Jun 2011 17:43:11 +0000 (18:43 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 9 Jun 2011 17:43:11 +0000 (18:43 +0100)

Trivial merge