Merge branch 'master' of github.com:cython/cython
authorRobert Bradshaw <robertwb@gmail.com>
Wed, 23 Oct 2013 03:48:59 +0000 (20:48 -0700)
committerRobert Bradshaw <robertwb@gmail.com>
Wed, 23 Oct 2013 03:48:59 +0000 (20:48 -0700)

Trivial merge