Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Sun, 19 Dec 2010 07:17:35 +0000 (10:17 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Sun, 19 Dec 2010 07:22:16 +0000 (10:22 +0300)
commitc0643507a7b283fc349e63518dc27685be47fda8
tree2513f33f4a19b3e47cfa2425b22ee8ec5e49cc7b
parent748f27fe99c1f4816afeba2249ccb8c788fd258c
parent84079e5120f9d53dbdb76c60c2711600b3377c39
Merge remote branch 'upstream/master'

Conflicts:
Cython/Compiler/ExprNodes.py
Cython/Compiler/Nodes.py
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/Symtab.py
Cython/Compiler/Code.py
Cython/Compiler/ExprNodes.py
Cython/Compiler/ModuleNode.py
Cython/Compiler/Nodes.py
Cython/Compiler/Optimize.py
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/Parsing.py
Cython/Compiler/Scanning.py
Cython/Compiler/Symtab.py
Cython/Compiler/TypeInference.py
runtests.py