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

merge
---

b734ecc0ca0eb9ecda47bf24d96ecd3e3053c079