merged in changes from cython-release branch
authorStefan Behnel <scoder@users.berlios.de>
Mon, 9 Aug 2010 17:43:14 +0000 (19:43 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Mon, 9 Aug 2010 17:43:14 +0000 (19:43 +0200)

Trivial merge