From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Sat, 11 Dec 2010 11:26:13 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe9bba054fada3b39e5b47d7f64922f34cfcae0a;p=cython.git

Merge remote branch 'upstream/master'
---

fe9bba054fada3b39e5b47d7f64922f34cfcae0a