From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Thu, 13 Jan 2011 17:15:59 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e2e7a565f4bd8f8d45164b357e6e07a538a3017;p=cython.git

Merge remote branch 'upstream/master'
---

6e2e7a565f4bd8f8d45164b357e6e07a538a3017