From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Sun, 20 Feb 2011 16:17:55 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=61a825b774d2d3c5e60b13e50490e88d38f455e5;p=cython.git

Merge remote branch 'upstream/master'
---

61a825b774d2d3c5e60b13e50490e88d38f455e5