From: Dag Sverre Seljebotn <dagss@student.matnat.uio.no>
Date: Wed, 2 Jul 2008 11:16:50 +0000 (+0200)
Subject: more merge
X-Git-Tag: 0.9.8.1~49^2~110
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f0bc35a74c61b63f35d91e8abbb2ad20eaf4511;p=cython.git

more merge
---

6f0bc35a74c61b63f35d91e8abbb2ad20eaf4511