From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Mon, 28 Apr 2008 19:18:31 +0000 (-0700)
Subject: merge
X-Git-Tag: 0.9.6.14~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06aa1104edfa0bc52aafdc13be1e142fdbdd6f0a;p=cython.git

merge
---

06aa1104edfa0bc52aafdc13be1e142fdbdd6f0a