merged changes from 0.9.6.10

diff --cc Cython/Compiler/Options.py
index 9f1bc141f70d9e06637bb99f54d8fe9db9dfa219,9a2120e912f002b69714e266692191b83e1f673b..d3511115a579cd5675493201676165917b27a92b
--- 1/Cython/Compiler/Options.py
--- 2/Cython/Compiler/Options.py
+++ b/Cython/Compiler/Options.py
@@@ -19,6 -19,17 +19,17 @@@ incref_local_binop = 
  
  # Decref global variables in this module on exit for garbage collection. 
  # 0: None, 1+: interned objects, 2+: cdef globals, 3+: types objects
 -generate_cleanup_code = 0
+ # Mostly for reducing noise for Valgrind, only executes at process exit
+ # (when all memory will be reclaimed anyways). 
 +generate_cleanup_code = 3
  
- annotate = 0
+ annotate = 0
+ 
+ # This will convert statements of the form "for i in range(...)" 
+ # to "for i from ..." when i is a cdef'd integer type, and the direction
+ # (i.e. sign of step) can be determined. 
+ # WARNING: This may change the symantics if the range causes assignment to 
+ # i to overflow. Specifically, if this option is set, an error will be
+ # raised before the loop is entered, wheras without this option the loop
+ # will execute util a overflowing value is encountered. 
+ convert_range = 0

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