From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Tue, 18 Jan 2011 19:38:27 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30872e939a465bb6cdda29c9e2aee0d54bc33e3a;p=cython.git

Merge remote branch 'upstream/master'
---

30872e939a465bb6cdda29c9e2aee0d54bc33e3a