Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Mon, 14 Feb 2011 06:42:37 +0000 (09:42 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Mon, 14 Feb 2011 06:42:37 +0000 (09:42 +0300)
commit86d1bd4a8cdf37b4ed606b782920c38a59764e10
tree215e4d0cb6ea9b1e7e732f2cb03f7d1ab6a76ea8
parentbb8cd8275bf910117750356845814d4d9d998d6e
parent9f2c79e180f69ec4caa627a3258aea042d843503
Merge remote branch 'upstream/master'

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