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

Merge remote branch 'upstream/master'
---

0e75afb7e915d7479707239a21f52462d7f2a628