From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Sun, 23 Jan 2011 08:47:47 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68d5d2c3a02d99bd0157c3358fb9fc7ec8e1a71a;p=cython.git

Merge remote branch 'upstream/master'
---

68d5d2c3a02d99bd0157c3358fb9fc7ec8e1a71a