1. fec12ff Merged revisions 80314-80315 via svnmerge from by Antoine Pitrou ยท 14 years ago