From: Stefan Behnel <scoder@users.berlios.de>
Date: Wed, 3 Nov 2010 09:23:56 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.14.alpha0~254
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4852e38fe8fe3a6bc3dc78f6976c2ac356065bf8;p=cython.git

merge
---

4852e38fe8fe3a6bc3dc78f6976c2ac356065bf8