merge

diff --cc Cython/Compiler/ModuleNode.py
index bc8e41c4931b0f47b4e57f79bb382a673b45e90f,c400499f7bf5abf95062d380962acd0c2edbfcd3..be9a8dd4ec741dbe80d7986e219cca702b8c09e7
--- 1/Cython/Compiler/ModuleNode.py
--- 2/Cython/Compiler/ModuleNode.py
+++ b/Cython/Compiler/ModuleNode.py
@@@ -573,9 -580,14 +573,7 @@@ class ModuleNode(Nodes.Node, Nodes.Bloc
          code.putln('static const char * %s= %s;' % (Naming.cfilenm_cname, Naming.file_c_macro))
          code.putln('static const char *%s;' % Naming.filename_cname)
          code.putln('static const char **%s;' % Naming.filetable_cname)
 -        if env.doc:
 -            docstr = env.doc
 -            if not isinstance(docstr, str):
 -                docstr = docstr.utf8encode()
 -            code.putln('')
 -            code.putln('static char %s[] = "%s";' % (
 -                    env.doc_cname, escape_byte_string(docstr)))
  
-         env.use_utility_code(streq_utility_code)
- 
          # XXX this is a mess
          for utility_code in PyrexTypes.c_int_from_py_function.specialize_list:
              env.use_utility_code(utility_code)

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

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

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

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