From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Sat, 8 Jan 2011 07:55:14 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6eb993239d8065c8053eaae93ba86cb00dbc2c09;p=cython.git

Merge remote branch 'upstream/master'
---

6eb993239d8065c8053eaae93ba86cb00dbc2c09