Merge branch 'master' into cdef-enums-stucts-and-unions
authorW. Trevor King <wking@drexel.edu>
Thu, 3 Mar 2011 17:51:55 +0000 (12:51 -0500)
committerW. Trevor King <wking@drexel.edu>
Thu, 3 Mar 2011 18:47:34 +0000 (13:47 -0500)
commitcbc14c89a1f72aa2f07837730c9d69085943955e
tree3d9a4fcbd66b3c8122a1391c5cd4cde2d40146fb
parent08efd0b2612ea0e62efa6e1f4fec6ad387fc23a0
parented8aac8a1f9eac589561dcb07499dde85c3666fb
Merge branch 'master' into cdef-enums-stucts-and-unions

Conflicts:
Cython/Compiler/Nodes.py
Cython/Compiler/Symtab.py
Cython/Compiler/ModuleNode.py
Cython/Compiler/Nodes.py
Cython/Compiler/ParseTreeTransforms.py
Cython/Compiler/Symtab.py
Cython/Compiler/TypeSlots.py