From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Sun, 5 Dec 2010 10:24:17 +0000 (-0800)
Subject: merge
X-Git-Tag: 0.14.alpha0~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d4b662036a9c12427133eccbaf2273daae45cc5;p=cython.git

merge
---

2d4b662036a9c12427133eccbaf2273daae45cc5