From: Stefan Behnel <scoder@users.berlios.de>
Date: Wed, 17 Feb 2010 20:59:28 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.13.beta0~340^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=82a11528e49bb6bc8005db6ce7ebae8b6f439ead;p=cython.git

merge
---

82a11528e49bb6bc8005db6ce7ebae8b6f439ead