Merge branch 'master' of github.com:cython/cython
authorRobert Bradshaw <robertwb@math.washington.edu>
Sat, 2 Apr 2011 10:23:59 +0000 (03:23 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sat, 2 Apr 2011 10:23:59 +0000 (03:23 -0700)

Trivial merge