From: Stefan Behnel <scoder@users.berlios.de>
Date: Fri, 14 Jan 2011 08:01:26 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.14.1rc0~8^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ccc69c11f73a3ed14635ce905f6700732239c1bf;p=cython.git

merge
---

ccc69c11f73a3ed14635ce905f6700732239c1bf