Merged revisions 67859 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67859 | amaury.forgeotdarc | 2008-12-19 23:56:48 +0100 (ven., 19 déc. 2008) | 4 lines

  #4700: crtlicense.txt is displayed by the license() command and should be kept ascii-only.

  Will port to 3.0
........

Tools/msi/crtlicense.txt

@@ -26,7 +26,7 @@ complies with this agreement, provided that you do not:
 - alter any copyright, trademark or patent notice in Microsoft's
 Distributable Code;
 
-- use Microsoft’s trademarks in your programs’ names or in a way that
+- use Microsoft's trademarks in your programs' names or in a way that
 suggests your programs come from or are endorsed by Microsoft;
 
 - distribute Microsoft's Distributable Code to run on a platform other