Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Mon, 17 Jan 2011 18:04:46 +0000 (21:04 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Mon, 17 Jan 2011 18:04:46 +0000 (21:04 +0300)
1  2 
Cython/Compiler/Code.py
Cython/Compiler/ModuleNode.py

Simple merge
Simple merge