Merge branch 'master' of github.com:cython/cython
authorRobert Bradshaw <robertwb@math.washington.edu>
Sun, 23 Jan 2011 10:56:14 +0000 (02:56 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sun, 23 Jan 2011 10:56:14 +0000 (02:56 -0800)

Trivial merge