From: Craig Citro <craigcitro@gmail.com>
Date: Wed, 10 Mar 2010 01:08:15 +0000 (-0800)
Subject: merge
X-Git-Tag: 0.13.beta0~319^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4964e6d8be1ea96eef8224fc35878c874f310ba9;p=cython.git

merge
---

4964e6d8be1ea96eef8224fc35878c874f310ba9