From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Fri, 25 Apr 2008 16:56:01 +0000 (-0700)
Subject: trivial merge
X-Git-Tag: 0.9.6.14~21^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2bde709434b2b48401c3692b28a621ec18bcf743;p=cython.git

trivial merge
---

2bde709434b2b48401c3692b28a621ec18bcf743