commit 4969f709cc07088a40574c05724d83cddc8fafc7
author Ezio Melotti <ezio.melotti@gmail.com> Tue Mar 15 05:59:46 2011 +0200
committer Ezio Melotti <ezio.melotti@gmail.com> Tue Mar 15 05:59:46 2011 +0200
tree ddb254d02f2bd0c4d9d7c141f5f95521669042a0
parent c48c19afe031d0a35a3d5aacddad4e113e1aeaf0
parent 42da663e6fe7ecbb89b17d596c76812a91bb99a4

#11515: Merge with 3.1.

Mac/BuildScript/build-installer.py

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index f0b3f3f..0a0c0d6 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -100,7 +100,7 @@
 
 ARCHLIST = universal_opts_map[UNIVERSALARCHS]
 
-# Source directory (asume we're in Mac/BuildScript)
+# Source directory (assume we're in Mac/BuildScript)
 SRCDIR = os.path.dirname(
         os.path.dirname(
             os.path.dirname(

Mac/Tools/pythonw.c

diff --git a/Mac/Tools/pythonw.c b/Mac/Tools/pythonw.c
index 0b2fafc..30c82ac 100644
--- a/Mac/Tools/pythonw.c
+++ b/Mac/Tools/pythonw.c
@@ -105,8 +105,8 @@
 
     count = 1;
 
-    /* Run the real python executable using the same architure as this
-     * executable, this allows users to controle the architecture using
+    /* Run the real python executable using the same architecture as this
+     * executable, this allows users to control the architecture using
      * "arch -ppc python"
      */