1. 1b7f891 Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from by Thomas Wouters ยท 17 years ago