From: Dag Sverre Seljebotn <dagss@student.matnat.uio.no>
Date: Fri, 12 Mar 2010 11:48:26 +0000 (+0100)
Subject: merge
X-Git-Tag: 0.13.beta0~319^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d683abd3584751a54230952ad520e3e4a26866fb;p=cython.git

merge
---

d683abd3584751a54230952ad520e3e4a26866fb