merge from 0.9.6.6

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

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

diff --cc Cython/Compiler/PyrexTypes.py
index 27eb2780170083bb4774bf3327be23174d2785bf,d05db0ce98431676b2c094debed9c8cf74ea7d90..6853f67f0ba1e85829aa33d2510d47b2aba8bf2f
--- 1/Cython/Compiler/PyrexTypes.py
--- 2/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@@ -709,10 -714,9 +714,11 @@@ class CStringType
      
      to_py_function = "PyString_FromString"
      from_py_function = "PyString_AsString"
+     exception_value = "NULL"
  
      def literal_code(self, value):
 +        if isinstance(value, unicode):
 +            value = value.encode("UTF-8")
          return '"%s"' % value