From: Stefan Behnel <scoder@users.berlios.de>
Date: Sat, 19 Jan 2008 13:03:10 +0000 (+0100)
Subject: local merge
X-Git-Tag: 0.9.6.14~45^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e2df795acd4951f3850e309d67d8feee81bdd628;p=cython.git

local merge
---

e2df795acd4951f3850e309d67d8feee81bdd628