Index: Python-2.5.2/Python/compile.c
===================================================================
--- Python-2.5.2.orig/Python/compile.c
+++ Python-2.5.2/Python/compile.c
@@ -30,7 +30,7 @@
 #include "symtable.h"
 #include "opcode.h"
 
-int Py_OptimizeFlag = 0;
+int Py_OptimizeFlag = 1;
 
 /*
   ISSUES:
Index: Python-2.5.2/Modules/main.c
===================================================================
--- Python-2.5.2.orig/Modules/main.c
+++ Python-2.5.2/Modules/main.c
@@ -40,7 +40,7 @@ static char **orig_argv;
 static int  orig_argc;
 
 /* command line options */
-#define BASE_OPTS "c:dEhim:OQ:StuUvVW:xX?"
+#define BASE_OPTS "c:dEhim:ONQ:StuUvVW:xX?"
 
 #ifndef RISCOS
 #define PROGRAM_OPTS BASE_OPTS
@@ -68,8 +68,7 @@ Options and arguments (and corresponding
 ";
 static char *usage_2 = "\
 -m mod : run library module as a script (terminates option list)\n\
--O     : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\
--OO    : remove doc-strings in addition to the -O optimizations\n\
+-N     : do NOT optimize generated bytecode\n\
 -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\
 -S     : don't imply 'import site' on initialization\n\
 -t     : issue warnings about inconsistent tab usage (-tt: issue errors)\n\
@@ -302,7 +301,10 @@ Py_Main(int argc, char **argv)
 			break;
 
 		case 'O':
-			Py_OptimizeFlag++;
+			fprintf(stderr, "-O is already default in this version. Ignoring\n");
+
+		case 'N':
+			Py_OptimizeFlag=0;
 			break;
 
 		case 'S':
-oe.git/log/packages/opie-sh-snes/opie-sh-snes_0.2.bb'>log</a><a href='/cgit/multitech-oe.git/tree/packages/opie-sh-snes/opie-sh-snes_0.2.bb?id=fa1f831bbf452179c778e7698dedcae323a6dfb0'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/opie-sh-snes/opie-sh-snes_0.2.bb?id=fa1f831bbf452179c778e7698dedcae323a6dfb0'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/opie-sh-snes/opie-sh-snes_0.2.bb?id=fa1f831bbf452179c778e7698dedcae323a6dfb0'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/opie-sh-snes/opie-sh-snes_0.2.bb'>
<input type='hidden' name='id' value='fa1f831bbf452179c778e7698dedcae323a6dfb0'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/multitech-oe.git/log/?id=fa1f831bbf452179c778e7698dedcae323a6dfb0'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=fa1f831bbf452179c778e7698dedcae323a6dfb0'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/opie-sh-snes?id=fa1f831bbf452179c778e7698dedcae323a6dfb0'>opie-sh-snes</a>/<a href='/cgit/multitech-oe.git/log/packages/opie-sh-snes/opie-sh-snes_0.2.bb?id=fa1f831bbf452179c778e7698dedcae323a6dfb0'>opie-sh-snes_0.2.bb</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit/multitech-oe.git/log/packages/opie-sh-snes/opie-sh-snes_0.2.bb?id=fa1f831bbf452179c778e7698dedcae323a6dfb0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>