Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Wed, 29 Dec 2010 11:10:32 +0000 (14:10 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Wed, 29 Dec 2010 11:10:32 +0000 (14:10 +0300)
1  2 
Cython/Compiler/Scanning.py

Simple merge