Merge branch 'master' of github.com:cython/cython
authorRobert Bradshaw <robertwb@math.washington.edu>
Sun, 27 Mar 2011 05:36:01 +0000 (22:36 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sun, 27 Mar 2011 05:36:01 +0000 (22:36 -0700)

Trivial merge