1. 11f7210 Merged revisions 69489-69490 via svnmerge from by Martin v. Löwis · 15 years ago