Merge branch 'master' of github.com:cython/cython
authorRobert Bradshaw <robertwb@gmail.com>
Wed, 6 Mar 2013 09:31:59 +0000 (01:31 -0800)
committerRobert Bradshaw <robertwb@gmail.com>
Wed, 6 Mar 2013 09:31:59 +0000 (01:31 -0800)

Trivial merge