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

Merge remote branch 'upstream/master'
---

a664bdef24f36c0ba0047b1defadbae4ad166a22