Merge with cython-devel

diff --cc Cython/Compiler/ExprNodes.py
Simple merge

diff --cc Cython/Compiler/ModuleNode.py
Simple merge

diff --cc Cython/Compiler/Nodes.py
Simple merge

diff --cc Cython/Compiler/Parsing.py
Simple merge

diff --cc runtests.py
index a2a83e5546bdecbbe3314d5ba0c0797a2a8e298d,5310dd7a7eeaa3755adf98183c7d0dfed93ba9ea..650f041d0668cd347026ca3510e5f524a0e5db4f
--- 1/runtests.py
--- 2/runtests.py
+++ b/runtests.py
@@@ -45,13 -45,14 +45,15 @@@ class ErrorWriter(object)
          return self._collect(True, True)
  
  class TestBuilder(object):
-     def __init__(self, rootdir, workdir, selectors, annotate, cleanup_workdir, cleanup_sharedlibs):
+     def __init__(self, rootdir, workdir, selectors, annotate,
 -                 cleanup_workdir, with_pyregr):
++                 cleanup_workdir, cleanup_sharedlibs, with_pyregr):
          self.rootdir = rootdir
          self.workdir = workdir
          self.selectors = selectors
          self.annotate = annotate
          self.cleanup_workdir = cleanup_workdir
 +        self.cleanup_sharedlibs = cleanup_sharedlibs
+         self.with_pyregr = with_pyregr
  
      def build_suite(self):
          suite = unittest.TestSuite()
@@@ -117,6 -118,6 +121,7 @@@ class CythonCompileTestCase(unittest.Te
          self.expect_errors = expect_errors
          self.annotate = annotate
          self.cleanup_workdir = cleanup_workdir
++        self.cleanup_sharedlibs = cleanup_sharedlibs
          unittest.TestCase.__init__(self)
  
      def shortDescription(self):
@@@ -377,9 -375,10 +385,9 @@@ if __name__ == '__main__'
  
      if options.filetests:
          filetests = TestBuilder(ROOTDIR, WORKDIR, selectors,
 -                                options.annotate_source,
 -                                options.cleanup_workdir,
 -                                options.pyregr)
 +                                options.annotate_source, options.cleanup_workdir,
-                                 options.cleanup_sharedlibs)
-         test_suite.addTests(filetests.build_suite())
++                                options.cleanup_sharedlibs, options.pyregr)
+         test_suite.addTests([filetests.build_suite()])
  
      unittest.TextTestRunner(verbosity=options.verbosity).run(test_suite)