From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Tue, 14 Dec 2010 19:17:20 +0000 (-0800)
Subject: merge
X-Git-Tag: 0.14.1rc0~13^2~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1145f1448583c2064ad6f45bf93b8e479c31ec4e;p=cython.git

merge
---

1145f1448583c2064ad6f45bf93b8e479c31ec4e