Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Sat, 15 Jan 2011 10:44:36 +0000 (13:44 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Sat, 15 Jan 2011 10:44:36 +0000 (13:44 +0300)
commit7b515269b5e5ec3cf763926fb73fde5ebe46683c
treef627e6ea7debd1b5689bcb916c2b41434f28079c
parent4b64c5b0494942edf40cbef366be6a74fea5481a
parent7f45b0b740fabae19b29a1d26c6975e25ae24845
Merge remote branch 'upstream/master'

Conflicts:
runtests.py
Cython/Compiler/ParseTreeTransforms.py