From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Mon, 13 Dec 2010 20:36:08 +0000 (-0800)
Subject: merge
X-Git-Tag: 0.14.1rc0~13^2~33
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=940e168bef06e4c03454bd173f5e76a54539a4df;p=cython.git

merge
---

940e168bef06e4c03454bd173f5e76a54539a4df