merge

diff --cc Cython/Compiler/Code.py
index 3f10cd8b773ac0e189bc3d9b52b49666c07af57a,2a426fe35a0969b1646c1e853522f5b2f71acc3f..4fd2147600e51d6a206fa44244e848982fe95feb
--- 1/Cython/Compiler/Code.py
--- 2/Cython/Compiler/Code.py
+++ b/Cython/Compiler/Code.py
@@@ -328,9 -235,9 +328,10 @@@ class GlobalState(object)
          'typeinfo',
          'before_global_var',
          'global_var',
 +        'decls',
          'all_the_rest',
-         'utility_code_def'
+         'utility_code_def',
+         'end'
      ]
      
  

diff --cc Cython/Compiler/ModuleNode.py
Simple merge

diff --cc Cython/Compiler/PyrexTypes.py
Simple merge