From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Sat, 15 Jan 2011 10:44:36 +0000 (+0300)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b515269b5e5ec3cf763926fb73fde5ebe46683c;p=cython.git

Merge remote branch 'upstream/master'

Conflicts:
	runtests.py
---

7b515269b5e5ec3cf763926fb73fde5ebe46683c