Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Sat, 19 Feb 2011 17:59:25 +0000 (20:59 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Sat, 19 Feb 2011 17:59:25 +0000 (20:59 +0300)
1  2 
Cython/Compiler/ExprNodes.py
Cython/Compiler/ModuleNode.py
Cython/Compiler/TypeInference.py

Simple merge
Simple merge
Simple merge