From: Stefan Behnel <scoder@users.berlios.de>
Date: Wed, 3 Nov 2010 10:08:27 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.14.alpha0~251
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e35692558f0ed01e21cd0354bf0023fcad01f9cc;p=cython.git

merge
---

e35692558f0ed01e21cd0354bf0023fcad01f9cc