trunk merge

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

diff --cc runtests.py
index e7ce124ac5dcc9e92b6e998dc163373461124629,331e066f002d3ef263aa24aef7cab3a160abc129..d255ba7c1fbd36c6e730a9bfe5fe6fa8155e4e9b
--- 1/runtests.py
--- 2/runtests.py
+++ b/runtests.py
@@@ -236,26 -220,13 +242,23 @@@ if __name__ == '__main__'
      # RUN ALL TESTS!
      ROOTDIR = os.path.join(os.getcwd(), os.path.dirname(sys.argv[0]), 'tests')
      WORKDIR = os.path.join(os.getcwd(), 'BUILD')
 -    if os.path.exists(WORKDIR):
 -        shutil.rmtree(WORKDIR, ignore_errors=True)
 -    os.makedirs(WORKDIR)
 -
 -    print "Running tests against Cython %s" % version
 -    print "Python", sys.version
 -    print
 +    if WITH_CYTHON:
 +        if os.path.exists(WORKDIR):
 +            shutil.rmtree(WORKDIR, ignore_errors=True)
 +    if not os.path.exists(WORKDIR):
 +        os.makedirs(WORKDIR)
 +
-     if not sys.path or sys.path[0] != WORKDIR:
-         sys.path.insert(0, WORKDIR)
- 
 +    if WITH_CYTHON:
 +        from Cython.Compiler.Version import version
 +        from Cython.Compiler.Main import \
 +            CompilationOptions, \
 +            default_options as pyrex_default_options, \
 +            compile as cython_compile
 +        print("Running tests against Cython %s" % version)
 +    else:
 +        print("Running tests without Cython.")
 +    print("Python", sys.version)
 +    print("")
  
      try:
          sys.argv.remove("-C")