Merge branch 'master' of git://github.com/cython/cython
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 18 Feb 2011 21:40:41 +0000 (13:40 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 18 Feb 2011 21:40:41 +0000 (13:40 -0800)

Trivial merge