Merge branch 'master' of github.com:cython/cython
authorRobert Bradshaw <robertwb@gmail.com>
Tue, 22 Oct 2013 06:57:20 +0000 (23:57 -0700)
committerRobert Bradshaw <robertwb@gmail.com>
Tue, 22 Oct 2013 06:57:20 +0000 (23:57 -0700)

Trivial merge