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

merge
---

ea858a2e95f9228b3ac7198c68ba0e3076e68e42