From: Stefan Behnel <scoder@users.berlios.de>
Date: Fri, 25 Apr 2008 17:59:52 +0000 (+0200)
Subject: merge
X-Git-Tag: 0.9.6.14~20^2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=62daa125bcbfc6a56b43e9868becbecdcd1d8f15;p=cython.git

merge
---

62daa125bcbfc6a56b43e9868becbecdcd1d8f15