From: Stefan Behnel <scoder@users.berlios.de>
Date: Fri, 27 Nov 2009 20:17:40 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.12.1~114
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5626e87b48086dde2b05b7bcc2193482edfd512a;p=cython.git

merge
---

5626e87b48086dde2b05b7bcc2193482edfd512a