Merge branch 'master' of github.com:cython/cython
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 14 Jan 2011 08:55:45 +0000 (00:55 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 14 Jan 2011 08:55:45 +0000 (00:55 -0800)

Trivial merge