From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Tue, 15 Feb 2011 19:25:07 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3cae35eab1171fd7e717aa6312e38c3a33966952;p=cython.git

Merge remote branch 'upstream/master'
---

3cae35eab1171fd7e717aa6312e38c3a33966952