1. 19397e5 Merging from tim-doctest-branch, which is now closed. by Tim Peters ยท 20 years ago