branch merge

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

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

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

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

diff --cc Cython/Compiler/ParseTreeTransforms.py
index 7967a19710eb52cc06b94d7d013c4acd27aa0b12,44b69244c6cd9174f81f3f8c0fd016dc9a4121e1..8e7a7fd7ff19f8a24cdcdea7c4a61325262399de
--- 1/Cython/Compiler/ParseTreeTransforms.py
--- 2/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@@ -6,14 -11,9 +11,15 @@@ from Cython.Compiler.ExprNodes import 
  from Cython.Compiler.UtilNodes import *
  from Cython.Compiler.TreeFragment import TreeFragment, TemplateTransform
  from Cython.Compiler.StringEncoding import EncodedString
- from Cython.Compiler.Errors import error, CompileError
- from Cython.Compiler import PyrexTypes
+ from Cython.Compiler.Errors import error, warning, CompileError
+ from Cython.Compiler import PyrexTypes, Naming
+ 
 +
 +try:
 +    set
 +except NameError:
 +    from sets import Set as set
 +
  import copy
  
  

diff --cc runtests.py
Simple merge

diff --cc setup.py
index 23d550a580e1f97f7be6f7513993854e6644446a,1db45e0fde568d31b2db3df87ecee228f97a8106..e1f28e6d0cfd877ea75d03bfc52d7b1dd1d2665f
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -80,11 -80,11 +80,11 @@@ if 'setuptools' in sys.modules
      scripts = []
  else:
      if os.name == "posix":
 -        scripts = ["bin/cython"]
 +        scripts = ["bin/cython", "bin/cygdb"]
      else:
 -        scripts = ["cython.py"]
 +        scripts = ["cython.py", "cygdb.py"]
  
- def compile_cython_modules(profile=False):
+ def compile_cython_modules(profile=False, compile_more=False, cython_with_refnanny=False):
      source_root = os.path.abspath(os.path.dirname(__file__))
      compiled_modules = ["Cython.Plex.Scanners",
                          "Cython.Plex.Actions",