From: Stefan Behnel <scoder@users.berlios.de>
Date: Thu, 30 Dec 2010 00:23:00 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.14.1rc0~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=968d35d13bd7a069ea9bf0c5d8222aa349fab06d;p=cython.git

merge
---

968d35d13bd7a069ea9bf0c5d8222aa349fab06d