From: Craig Citro <craigcitro@gmail.com>
Date: Tue, 9 Feb 2010 18:04:11 +0000 (-0800)
Subject: merge
X-Git-Tag: 0.13.beta0~349^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=144c66eea2dfb3545c82a5b6811eb0289c0a1db7;p=cython.git

merge
---

144c66eea2dfb3545c82a5b6811eb0289c0a1db7