From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Tue, 21 Dec 2010 10:16:19 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=46bbbabab386c02fded11c609846dc9ca306da16;p=cython.git

Merge remote branch 'upstream/master'
---

46bbbabab386c02fded11c609846dc9ca306da16