Merge branch 'master' of https://github.com/cython/cython into ticket_664
authorVitja Makarov <vitja.makarov@gmail.com>
Thu, 3 Mar 2011 19:39:31 +0000 (22:39 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Thu, 3 Mar 2011 19:39:31 +0000 (22:39 +0300)

Trivial merge