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

Merge remote branch 'upstream/master'
---

6ed290c9f58213d168f5947b038eccd1f7417d56