From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Fri, 12 Nov 2010 09:43:14 +0000 (-0800)
Subject: merge
X-Git-Tag: 0.14.alpha0~178^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a128757e358d960b105877bad15cc181fa8597c2;p=cython.git

merge
---

a128757e358d960b105877bad15cc181fa8597c2