Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Tue, 28 Dec 2010 18:50:58 +0000 (21:50 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Tue, 28 Dec 2010 18:51:39 +0000 (21:51 +0300)
commit7f630812e3ac8fe8ba01531c8a958b90efc516d2
tree4d2e855710811aba80c60d38179693ae7616acac
parent46bbbabab386c02fded11c609846dc9ca306da16
parentfd4f9c448b7000d70fc54dad49148d49594a100c
Merge remote branch 'upstream/master'

Conflicts:
Cython/Compiler/Nodes.py
Cython/Compiler/ExprNodes.py
Cython/Compiler/Nodes.py