Merge remote branch 'upstream/master'

author Vitja Makarov <vitja.makarov@gmail.com>

Thu, 13 Jan 2011 05:58:05 +0000 (08:58 +0300)

committer Vitja Makarov <vitja.makarov@gmail.com>

Thu, 13 Jan 2011 05:58:05 +0000 (08:58 +0300)
author Vitja Makarov <vitja.makarov@gmail.com>
Thu, 13 Jan 2011 05:58:05 +0000 (08:58 +0300)
committer Vitja Makarov <vitja.makarov@gmail.com>
Thu, 13 Jan 2011 05:58:05 +0000 (08:58 +0300)
diff --cc Cython/Compiler/ModuleNode.py
Simple merge
diff --cc Cython/Compiler/Parsing.py
Simple merge
author	Vitja Makarov <vitja.makarov@gmail.com>
	Thu, 13 Jan 2011 05:58:05 +0000 (08:58 +0300)
committer	Vitja Makarov <vitja.makarov@gmail.com>
	Thu, 13 Jan 2011 05:58:05 +0000 (08:58 +0300)
		1	2
Cython/Compiler/ModuleNode.py	patch \|	diff1 \|	diff2 \|	blob \| history
Cython/Compiler/Parsing.py	patch \|	diff1 \|	diff2 \|	blob \| history