From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Thu, 3 Mar 2011 20:49:19 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=231b6b6467da73089a1a5d67613b79d897b891c0;p=cython.git

Merge remote branch 'upstream/master'
---

231b6b6467da73089a1a5d67613b79d897b891c0