From: Stefan Behnel <scoder@users.berlios.de>
Date: Fri, 12 Nov 2010 22:03:29 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.14.alpha0~161
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30cf4b75e591433c7af3055bac64c2c57b71ff80;p=cython.git

merge
---

30cf4b75e591433c7af3055bac64c2c57b71ff80