merge

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

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

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

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

diff --cc runtests.py
Simple merge