merge

diff --cc Cython/Compiler/ModuleNode.py
index fe6ba91eda373f95e2fcacda768ead325fe0a606,09d3814d4a68a1e798314b1ee877946d520a1869..b170a17125daefe747724f58cd5a911f2f241a6c
--- 1/Cython/Compiler/ModuleNode.py
--- 2/Cython/Compiler/ModuleNode.py
+++ b/Cython/Compiler/ModuleNode.py
@@@ -347,7 -367,8 +347,7 @@@ class ModuleNode(Nodes.Node, Nodes.Bloc
              self.generate_typeobject_predeclaration(entry, code)
              self.generate_exttype_vtable_struct(entry, code)
              self.generate_exttype_vtabptr_declaration(entry, code)
-     
+ 
 -    
      def generate_declarations_for_modules(self, env, modules, code):
          code.putln("")
          code.putln("/* Declarations */")