From: Stefan Behnel <scoder@users.berlios.de>
Date: Wed, 12 Jan 2011 20:45:05 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.14.1rc0~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c841ce3d147916013969bcce4d95beb0daa52ee;p=cython.git

merge
---

5c841ce3d147916013969bcce4d95beb0daa52ee