merge from 0.9.6.6

diff --cc setup.py
index 3a10ae3bcd6257fd34276087e963282419da7a0f,f58045aba230e7c15cf8109facf71ecdf4cf3aea..d26c15c4e3da109f2a5814d054166624557ab0bc
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -1,8 -1,13 +1,13 @@@
  from distutils.core import setup
  from distutils.sysconfig import get_python_lib
 -import os
 +import os, sys
+ import sys
  from Cython.Compiler.Version import version
  
+ compiler_dir = os.path.join(get_python_lib(prefix=''), 'Cython/Compiler')
+ if sys.platform == "win32":
+     compiler_dir = compiler_dir[len(sys.prefix)+1:]
+ 
  setup_args = {}
  
  if sys.version_info < (2,4):