another merge fix
authorStefan Behnel <scoder@users.berlios.de>
Wed, 21 Oct 2009 06:49:05 +0000 (08:49 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 21 Oct 2009 06:49:05 +0000 (08:49 +0200)
commitdeffc0adf63615feb410ea09590dac25d5a44e91
treeb24ac5751387a579c19d3e89917e6eed2b1df560
parent39d60c718daf06898e85a37e92542708d6a70143
another merge fix
Cython/Compiler/Nodes.py