merged in latest cython-devel

diff --cc Cython/Compiler/Nodes.py
index cf77dc79ad4c76b128cc71470c6c1a96bb8a7531,cbae103906fc7395d138c3f4fe884a56c95e9504..48738e34fe2e29788872d4c96dbbb01d175214f1
--- 1/Cython/Compiler/Nodes.py
--- 2/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@@ -3599,10 -3493,13 +3610,18 @@@ class PrintStatNode(StatNode)
              self.arg_tuple.generate_disposal_code(code)
              self.arg_tuple.free_temps(code)
  
+         if self.stream:
+             self.stream.generate_disposal_code(code)
+             self.stream.free_temps(code)
+ 
 +    def generate_function_definitions(self, env, code):
++        if self.stream:
++            self.stream.generate_function_definitions(env, code)
 +        self.arg_tuple.generate_function_definitions(env, code)
 +
      def annotate(self, code):
+         if self.stream:
+             self.stream.annotate(code)
          self.arg_tuple.annotate(code)
  
  

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

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