merged in latest cython-devel

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

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

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

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

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

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

diff --cc Cython/Compiler/Optimize.py
index f40a301be42c1e9212566aa0a6d9156563ed4e6e,cfd4a933c79aa73f668307fd8f690b9582f55a45..f6ef6a82f263987c2487cd30d24cc006659751f3
--- 1/Cython/Compiler/Optimize.py
--- 2/Cython/Compiler/Optimize.py
+++ b/Cython/Compiler/Optimize.py
@@@ -7,24 -7,13 +7,20 @@@ import UtilNode
  import TypeSlots
  import Symtab
  import Options
 -from StringEncoding import EncodedString
  
 +from Code import UtilityCode
 +from StringEncoding import EncodedString
 +from Errors import error
  from ParseTreeTransforms import SkipDeclarations
  
- #def unwrap_node(node):
- #    while isinstance(node, ExprNodes.PersistentNode):
- #        node = node.arg
- #    return node
- 
- # Temporary hack while PersistentNode is out of order
 +try:
 +    reduce
 +except NameError:
 +    from functools import reduce
 +
  def unwrap_node(node):
+     while isinstance(node, UtilNodes.ResultRefNode):
+         node = node.expression
      return node
  
  def is_common_value(a, b):

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

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