Merge branch 'master' of github.com:cython/cython
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 1 Apr 2011 18:45:44 +0000 (11:45 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 1 Apr 2011 18:45:44 +0000 (11:45 -0700)

Trivial merge