]> granicus.if.org Git - python/commitdiff
Merged changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 5 May 2011 11:59:59 +0000 (12:59 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 5 May 2011 11:59:59 +0000 (12:59 +0100)

Trivial merge