From: Dag Sverre Seljebotn <dagss@student.matnat.uio.no>
Date: Thu, 21 May 2009 19:13:29 +0000 (+0200)
Subject: merge
X-Git-Tag: 0.12.alpha0~291
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=128c556308bc75017086be0a80dee88cbc4ee240;p=cython.git

merge
---

128c556308bc75017086be0a80dee88cbc4ee240
diff --cc Cython/Compiler/Code.py
index 3f10cd8b,2a426fe3..4fd21476
--- a/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'
      ]