merge

diff --cc Cython/Compiler/ModuleNode.py
index dd3161b7a6c3d9f868ebf2f1f1e4fec440e93bec,0674926cce13bfc831d3514285890930407f5747..07eedde9582c578c4b1098a6f1d8d72dfd1f6b34
--- 1/Cython/Compiler/ModuleNode.py
--- 2/Cython/Compiler/ModuleNode.py
+++ b/Cython/Compiler/ModuleNode.py
@@@ -264,9 -268,13 +264,9 @@@ class ModuleNode(Nodes.Node, Nodes.Bloc
  
          code = globalstate['before_global_var']
          code.putln('#define __Pyx_MODULE_NAME "%s"' % self.full_module_name)
-         code.putln("int %s%s = %s;" % (Naming.module_is_main, self.full_module_name.replace('.', '__'), int(Options.embed)))
+         code.putln("int %s%s = 0;" % (Naming.module_is_main, self.full_module_name.replace('.', '__')))
          code.putln("")
          code.putln("/* Implementation of %s */" % env.qualified_name)
 -        self.generate_const_definitions(env, code)
 -        self.generate_interned_num_decls(env, code)
 -        self.generate_interned_string_decls(env, code)
 -        self.generate_py_string_decls(env, code)
  
          code = globalstate['all_the_rest']