1. 6d6c1a3 Merge of descr-branch back into trunk. by Tim Peters ยท 23 years ago