Merge branch 'master' of https://github.com/cython/cython
authorMark Florisson <markflorisson88@gmail.com>
Tue, 14 Dec 2010 00:14:13 +0000 (01:14 +0100)
committerMark Florisson <markflorisson88@gmail.com>
Tue, 14 Dec 2010 00:14:13 +0000 (01:14 +0100)

Trivial merge