Make sure that multivariate_normal() uses the standard_normal() method rather than the function so as to use the same consistent state.

2 files changed, 1489 insertions, 1865 deletions

diff --git a/numpy/random/mtrand/mtrand.c b/numpy/random/mtrand/mtrand.c
index 92f8cd75e..247e89d2b 100644
--- a/numpy/random/mtrand/mtrand.c
+++ b/numpy/random/mtrand/mtrand.c
@@ -1,16 +1,32 @@
-/* Generated by Pyrex 0.9.5.1a on Fri Nov 23 17:16:35 2007 */
+/* Generated by Pyrex 0.9.6.4 on Tue Feb 12 15:30:45 2008 */
 
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"
 #ifndef PY_LONG_LONG
   #define PY_LONG_LONG LONG_LONG
 #endif
+#if PY_VERSION_HEX < 0x02050000
+  typedef int Py_ssize_t;
+  #define PY_SSIZE_T_MAX INT_MAX
+  #define PY_SSIZE_T_MIN INT_MIN
+  #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
+  #define PyInt_AsSsize_t(o)	PyInt_AsLong(o)
+#endif
+#ifndef WIN32
+  #ifndef __stdcall
+    #define __stdcall
+  #endif
+  #ifndef __cdecl
+    #define __cdecl
+  #endif
+#endif
 #ifdef __cplusplus
 #define __PYX_EXTERN_C extern "C"
 #else
 #define __PYX_EXTERN_C extern
 #endif
-__PYX_EXTERN_C double pow(double, double);
+#include <math.h>
 #include "string.h"
 #include "math.h"
 #include "numpy/arrayobject.h"
@@ -28,7 +44,7 @@ static int __pyx_lineno;
 static char *__pyx_filename;
 static char **__pyx_f;
 
-static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], int nargs, PyObject **args2, PyObject **kwds2); /*proto*/
+static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[],     Py_ssize_t nargs, PyObject **args2, PyObject **kwds2, char rqd_kwds[]); /*proto*/
 
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
 
@@ -39,7 +55,7 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*
 static PyObject *__Pyx_UnpackItem(PyObject *); /*proto*/
 static int __Pyx_EndUnpack(PyObject *); /*proto*/
 
-static PyObject *__Pyx_GetExcValue(void); /*proto*/
+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 
 static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
 
@@ -49,16 +65,34 @@ static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
 
 static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size);  /*proto*/
 
+static PyObject *__Pyx_ImportModule(char *name); /*proto*/
+
 static void __Pyx_AddTraceback(char *funcname); /*proto*/
 
 /* Declarations from mtrand */
 
+typedef double (*__pyx_t_6mtrand_rk_cont0)(rk_state *);
+
+typedef double (*__pyx_t_6mtrand_rk_cont1)(rk_state *,double);
+
+typedef double (*__pyx_t_6mtrand_rk_cont2)(rk_state *,double,double);
+
+typedef double (*__pyx_t_6mtrand_rk_cont3)(rk_state *,double,double,double);
+
+typedef long (*__pyx_t_6mtrand_rk_disc0)(rk_state *);
+
+typedef long (*__pyx_t_6mtrand_rk_discnp)(rk_state *,long,double);
+
+typedef long (*__pyx_t_6mtrand_rk_discnmN)(rk_state *,long,long,long);
+
+typedef long (*__pyx_t_6mtrand_rk_discd)(rk_state *,double);
 
 struct __pyx_obj_6mtrand_RandomState {
   PyObject_HEAD
-  rk_state (*internal_state);
+  rk_state *internal_state;
 };
 
+
 static PyTypeObject *__pyx_ptype_6mtrand_dtype = 0;
 static PyTypeObject *__pyx_ptype_6mtrand_ndarray = 0;
 static PyTypeObject *__pyx_ptype_6mtrand_flatiter = 0;
@@ -123,26 +157,27 @@ static PyObject *__pyx_k57;
 static PyObject *__pyx_k58;
 static PyObject *__pyx_k59;
 static PyObject *__pyx_k60;
-static PyObject *(__pyx_f_6mtrand_cont0_array(rk_state (*),double ((*)(rk_state (*))),PyObject *)); /*proto*/
-static PyObject *(__pyx_f_6mtrand_cont1_array_sc(rk_state (*),double ((*)(rk_state (*),double )),PyObject *,double )); /*proto*/
-static PyObject *(__pyx_f_6mtrand_cont1_array(rk_state (*),double ((*)(rk_state (*),double )),PyObject *,PyArrayObject *)); /*proto*/
-static PyObject *(__pyx_f_6mtrand_cont2_array_sc(rk_state (*),double ((*)(rk_state (*),double ,double )),PyObject *,double ,double )); /*proto*/
-static PyObject *(__pyx_f_6mtrand_cont2_array(rk_state (*),double ((*)(rk_state (*),double ,double )),PyObject *,PyArrayObject *,PyArrayObject *)); /*proto*/
-static PyObject *(__pyx_f_6mtrand_cont3_array_sc(rk_state (*),double ((*)(rk_state (*),double ,double ,double )),PyObject *,double ,double ,double )); /*proto*/
-static PyObject *(__pyx_f_6mtrand_cont3_array(rk_state (*),double ((*)(rk_state (*),double ,double ,double )),PyObject *,PyArrayObject *,PyArrayObject *,PyArrayObject *)); /*proto*/
-static PyObject *(__pyx_f_6mtrand_disc0_array(rk_state (*),long ((*)(rk_state (*))),PyObject *)); /*proto*/
-static PyObject *(__pyx_f_6mtrand_discnp_array_sc(rk_state (*),long ((*)(rk_state (*),long ,double )),PyObject *,long ,double )); /*proto*/
-static PyObject *(__pyx_f_6mtrand_discnp_array(rk_state (*),long ((*)(rk_state (*),long ,double )),PyObject *,PyArrayObject *,PyArrayObject *)); /*proto*/
-static PyObject *(__pyx_f_6mtrand_discnmN_array_sc(rk_state (*),long ((*)(rk_state (*),long ,long ,long )),PyObject *,long ,long ,long )); /*proto*/
-static PyObject *(__pyx_f_6mtrand_discnmN_array(rk_state (*),long ((*)(rk_state (*),long ,long ,long )),PyObject *,PyArrayObject *,PyArrayObject *,PyArrayObject *)); /*proto*/
-static PyObject *(__pyx_f_6mtrand_discd_array_sc(rk_state (*),long ((*)(rk_state (*),double )),PyObject *,double )); /*proto*/
-static PyObject *(__pyx_f_6mtrand_discd_array(rk_state (*),long ((*)(rk_state (*),double )),PyObject *,PyArrayObject *)); /*proto*/
-static double (__pyx_f_6mtrand_kahan_sum(double (*),long )); /*proto*/
+static PyObject *__pyx_f_6mtrand_cont0_array(rk_state *,__pyx_t_6mtrand_rk_cont0,PyObject *); /*proto*/
+static PyObject *__pyx_f_6mtrand_cont1_array_sc(rk_state *,__pyx_t_6mtrand_rk_cont1,PyObject *,double); /*proto*/
+static PyObject *__pyx_f_6mtrand_cont1_array(rk_state *,__pyx_t_6mtrand_rk_cont1,PyObject *,PyArrayObject *); /*proto*/
+static PyObject *__pyx_f_6mtrand_cont2_array_sc(rk_state *,__pyx_t_6mtrand_rk_cont2,PyObject *,double,double); /*proto*/
+static PyObject *__pyx_f_6mtrand_cont2_array(rk_state *,__pyx_t_6mtrand_rk_cont2,PyObject *,PyArrayObject *,PyArrayObject *); /*proto*/
+static PyObject *__pyx_f_6mtrand_cont3_array_sc(rk_state *,__pyx_t_6mtrand_rk_cont3,PyObject *,double,double,double); /*proto*/
+static PyObject *__pyx_f_6mtrand_cont3_array(rk_state *,__pyx_t_6mtrand_rk_cont3,PyObject *,PyArrayObject *,PyArrayObject *,PyArrayObject *); /*proto*/
+static PyObject *__pyx_f_6mtrand_disc0_array(rk_state *,__pyx_t_6mtrand_rk_disc0,PyObject *); /*proto*/
+static PyObject *__pyx_f_6mtrand_discnp_array_sc(rk_state *,__pyx_t_6mtrand_rk_discnp,PyObject *,long,double); /*proto*/
+static PyObject *__pyx_f_6mtrand_discnp_array(rk_state *,__pyx_t_6mtrand_rk_discnp,PyObject *,PyArrayObject *,PyArrayObject *); /*proto*/
+static PyObject *__pyx_f_6mtrand_discnmN_array_sc(rk_state *,__pyx_t_6mtrand_rk_discnmN,PyObject *,long,long,long); /*proto*/
+static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state *,__pyx_t_6mtrand_rk_discnmN,PyObject *,PyArrayObject *,PyArrayObject *,PyArrayObject *); /*proto*/
+static PyObject *__pyx_f_6mtrand_discd_array_sc(rk_state *,__pyx_t_6mtrand_rk_discd,PyObject *,double); /*proto*/
+static PyObject *__pyx_f_6mtrand_discd_array(rk_state *,__pyx_t_6mtrand_rk_discd,PyObject *,PyArrayObject *); /*proto*/
+static double __pyx_f_6mtrand_kahan_sum(double *,long); /*proto*/
 
 
 /* Implementation of mtrand */
 
 
+static PyObject *__pyx_n_numpy;
 static PyObject *__pyx_n__sp;
 static PyObject *__pyx_n__rand;
 static PyObject *__pyx_n_seed;
@@ -191,13 +226,12 @@ static PyObject *__pyx_n_multinomial;
 static PyObject *__pyx_n_dirichlet;
 static PyObject *__pyx_n_shuffle;
 static PyObject *__pyx_n_permutation;
-static PyObject *__pyx_n_numpy;
 
 static PyObject *__pyx_n_empty;
 static PyObject *__pyx_n_float64;
 
-static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*))),PyObject *__pyx_v_size) {
-  double (*__pyx_v_array_data);
+static PyObject *__pyx_f_6mtrand_cont0_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont0 __pyx_v_func,PyObject *__pyx_v_size) {
+  double *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   long __pyx_v_length;
   long __pyx_v_i;
@@ -209,11 +243,9 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double ((
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":129 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":129 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":130 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -222,7 +254,7 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double ((
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":132 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":132 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -242,20 +274,18 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double ((
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":133 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":133 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":134 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":134 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":135 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":135 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":136 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":137 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":137 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -276,8 +306,8 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double ((
   return __pyx_r;
 }
 
-static PyObject *__pyx_f_6mtrand_cont1_array_sc(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*),double )),PyObject *__pyx_v_size,double __pyx_v_a) {
-  double (*__pyx_v_array_data);
+static PyObject *__pyx_f_6mtrand_cont1_array_sc(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont1 __pyx_v_func,PyObject *__pyx_v_size,double __pyx_v_a) {
+  double *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   long __pyx_v_length;
   long __pyx_v_i;
@@ -289,11 +319,9 @@ static PyObject *__pyx_f_6mtrand_cont1_array_sc(rk_state (*__pyx_v_state),double
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":146 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":146 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":147 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -302,7 +330,7 @@ static PyObject *__pyx_f_6mtrand_cont1_array_sc(rk_state (*__pyx_v_state),double
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":149 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":149 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -322,20 +350,18 @@ static PyObject *__pyx_f_6mtrand_cont1_array_sc(rk_state (*__pyx_v_state),double
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":150 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":150 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":151 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":151 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":152 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":152 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":153 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a);
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":154 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":154 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -360,11 +386,11 @@ static PyObject *__pyx_n_ValueError;
 
 static PyObject *__pyx_k61p;
 
-static char (__pyx_k61[]) = "size is not compatible with inputs";
+static char __pyx_k61[] = "size is not compatible with inputs";
 
-static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*),double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa) {
-  double (*__pyx_v_array_data);
-  double (*__pyx_v_oa_data);
+static PyObject *__pyx_f_6mtrand_cont1_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont1 __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa) {
+  double *__pyx_v_array_data;
+  double *__pyx_v_oa_data;
   PyArrayObject *arrayObject;
   npy_intp __pyx_v_length;
   npy_intp __pyx_v_i;
@@ -382,44 +408,44 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double ((
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":165 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":165 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":166 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":166 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":167 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":167 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":168 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":168 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":169 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":169 */
     __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2)));
     Py_DECREF(((PyObject *)__pyx_v_itera));
     __pyx_v_itera = ((PyArrayIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":170 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":170 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":171 */
-      (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double (*))__pyx_v_itera->dataptr)[0]));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":171 */
+      (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double *)__pyx_v_itera->dataptr)[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":172 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":172 */
       PyArray_ITER_NEXT(__pyx_v_itera);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":174 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":174 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -439,21 +465,19 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double ((
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":175 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":175 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":176 */
-    __pyx_3 = PyArray_MultiIterNew(2,((void (*))arrayObject),((void (*))__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":176 */
+    __pyx_3 = PyArray_MultiIterNew(2,((void *)arrayObject),((void *)__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":178 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":178 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":179 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; goto __pyx_L1;}
       __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; goto __pyx_L1;}
       Py_INCREF(__pyx_k61p);
@@ -468,23 +492,23 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double ((
     }
     __pyx_L5:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":180 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":180 */
     __pyx_5 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":181 */
-      __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":181 */
+      __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":182 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":182 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":183 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":183 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
     }
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":184 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":184 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -506,8 +530,8 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double ((
   return __pyx_r;
 }
 
-static PyObject *__pyx_f_6mtrand_cont2_array_sc(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*),double ,double )),PyObject *__pyx_v_size,double __pyx_v_a,double __pyx_v_b) {
-  double (*__pyx_v_array_data);
+static PyObject *__pyx_f_6mtrand_cont2_array_sc(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont2 __pyx_v_func,PyObject *__pyx_v_size,double __pyx_v_a,double __pyx_v_b) {
+  double *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   long __pyx_v_length;
   long __pyx_v_i;
@@ -519,11 +543,9 @@ static PyObject *__pyx_f_6mtrand_cont2_array_sc(rk_state (*__pyx_v_state),double
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":193 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":193 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":194 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -532,7 +554,7 @@ static PyObject *__pyx_f_6mtrand_cont2_array_sc(rk_state (*__pyx_v_state),double
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":196 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":196 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -552,20 +574,18 @@ static PyObject *__pyx_f_6mtrand_cont2_array_sc(rk_state (*__pyx_v_state),double
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":197 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":197 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":198 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":198 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":199 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":199 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":200 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b);
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":201 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":201 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -588,12 +608,12 @@ static PyObject *__pyx_f_6mtrand_cont2_array_sc(rk_state (*__pyx_v_state),double
 
 static PyObject *__pyx_k62p;
 
-static char (__pyx_k62[]) = "size is not compatible with inputs";
+static char __pyx_k62[] = "size is not compatible with inputs";
 
-static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*),double ,double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa,PyArrayObject *__pyx_v_ob) {
-  double (*__pyx_v_array_data);
-  double (*__pyx_v_oa_data);
-  double (*__pyx_v_ob_data);
+static PyObject *__pyx_f_6mtrand_cont2_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont2 __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa,PyArrayObject *__pyx_v_ob) {
+  double *__pyx_v_array_data;
+  double *__pyx_v_oa_data;
+  double *__pyx_v_ob_data;
   PyArrayObject *arrayObject;
   npy_intp __pyx_v_i;
   PyArrayMultiIterObject *__pyx_v_multi;
@@ -609,48 +629,48 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double ((
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":214 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":214 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":215 */
-    __pyx_2 = PyArray_MultiIterNew(2,((void (*))__pyx_v_oa),((void (*))__pyx_v_ob)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 215; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":215 */
+    __pyx_2 = PyArray_MultiIterNew(2,((void *)__pyx_v_oa),((void *)__pyx_v_ob)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 215; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":216 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":216 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 216; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":217 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":217 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":218 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":218 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":219 */
-      __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":219 */
+      __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":220 */
-      __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":220 */
+      __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":221 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":221 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":222 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":222 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":224 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":224 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -670,21 +690,19 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double ((
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":225 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":225 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":226 */
-    __pyx_4 = PyArray_MultiIterNew(3,((void (*))arrayObject),((void (*))__pyx_v_oa),((void (*))__pyx_v_ob)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":226 */
+    __pyx_4 = PyArray_MultiIterNew(3,((void *)arrayObject),((void *)__pyx_v_oa),((void *)__pyx_v_ob)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 226; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":227 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":227 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":228 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; goto __pyx_L1;}
       __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; goto __pyx_L1;}
       Py_INCREF(__pyx_k62p);
@@ -699,29 +717,29 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double ((
     }
     __pyx_L5:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":229 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":229 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":230 */
-      __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":230 */
+      __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":231 */
-      __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":231 */
+      __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":232 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":232 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":233 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":233 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":234 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":234 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,2);
     }
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":235 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":235 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -743,8 +761,8 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double ((
   return __pyx_r;
 }
 
-static PyObject *__pyx_f_6mtrand_cont3_array_sc(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*),double ,double ,double )),PyObject *__pyx_v_size,double __pyx_v_a,double __pyx_v_b,double __pyx_v_c) {
-  double (*__pyx_v_array_data);
+static PyObject *__pyx_f_6mtrand_cont3_array_sc(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont3 __pyx_v_func,PyObject *__pyx_v_size,double __pyx_v_a,double __pyx_v_b,double __pyx_v_c) {
+  double *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   long __pyx_v_length;
   long __pyx_v_i;
@@ -756,11 +774,9 @@ static PyObject *__pyx_f_6mtrand_cont3_array_sc(rk_state (*__pyx_v_state),double
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":245 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":245 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":246 */
     __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -769,7 +785,7 @@ static PyObject *__pyx_f_6mtrand_cont3_array_sc(rk_state (*__pyx_v_state),double
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":248 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":248 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -789,20 +805,18 @@ static PyObject *__pyx_f_6mtrand_cont3_array_sc(rk_state (*__pyx_v_state),double
     arrayObject = ((PyArrayObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":249 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":249 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":250 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":250 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":251 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":251 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":252 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c);
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":253 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":253 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -825,13 +839,13 @@ static PyObject *__pyx_f_6mtrand_cont3_array_sc(rk_state (*__pyx_v_state),double
 
 static PyObject *__pyx_k63p;
 
-static char (__pyx_k63[]) = "size is not compatible with inputs";
+static char __pyx_k63[] = "size is not compatible with inputs";
 
-static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*),double ,double ,double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa,PyArrayObject *__pyx_v_ob,PyArrayObject *__pyx_v_oc) {
-  double (*__pyx_v_array_data);
-  double (*__pyx_v_oa_data);
-  double (*__pyx_v_ob_data);
-  double (*__pyx_v_oc_data);
+static PyObject *__pyx_f_6mtrand_cont3_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_cont3 __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa,PyArrayObject *__pyx_v_ob,PyArrayObject *__pyx_v_oc) {
+  double *__pyx_v_array_data;
+  double *__pyx_v_oa_data;
+  double *__pyx_v_ob_data;
+  double *__pyx_v_oc_data;
   PyArrayObject *arrayObject;
   npy_intp __pyx_v_i;
   PyArrayMultiIterObject *__pyx_v_multi;
@@ -848,51 +862,51 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double ((
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":267 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":267 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":268 */
-    __pyx_2 = PyArray_MultiIterNew(3,((void (*))__pyx_v_oa),((void (*))__pyx_v_ob),((void (*))__pyx_v_oc)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 268; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":268 */
+    __pyx_2 = PyArray_MultiIterNew(3,((void *)__pyx_v_oa),((void *)__pyx_v_ob),((void *)__pyx_v_oc)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 268; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":269 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":269 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 269; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":270 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":270 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":271 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":271 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":272 */
-      __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":272 */
+      __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":273 */
-      __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":273 */
+      __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":274 */
-      __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":274 */
+      __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":275 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":275 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":276 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":276 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":278 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":278 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -912,21 +926,19 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double ((
     arrayObject = ((PyArrayObject *)__pyx_5);
     Py_DECREF(__pyx_5); __pyx_5 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":279 */
-    __pyx_v_array_data = ((double (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":279 */
+    __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":280 */
-    __pyx_4 = PyArray_MultiIterNew(4,((void (*))arrayObject),((void (*))__pyx_v_oa),((void (*))__pyx_v_ob),((void (*))__pyx_v_oc)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":280 */
+    __pyx_4 = PyArray_MultiIterNew(4,((void *)arrayObject),((void *)__pyx_v_oa),((void *)__pyx_v_ob),((void *)__pyx_v_oc)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":282 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":282 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":283 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 283; goto __pyx_L1;}
       __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 283; goto __pyx_L1;}
       Py_INCREF(__pyx_k63p);
@@ -941,29 +953,29 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double ((
     }
     __pyx_L5:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":284 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":284 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":285 */
-      __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":285 */
+      __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":286 */
-      __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":286 */
+      __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":287 */
-      __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,3));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":287 */
+      __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,3));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":288 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":288 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":289 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":289 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":290 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":290 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -988,8 +1000,8 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double ((
 
 static PyObject *__pyx_n_int;
 
-static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*))),PyObject *__pyx_v_size) {
-  long (*__pyx_v_array_data);
+static PyObject *__pyx_f_6mtrand_disc0_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_disc0 __pyx_v_func,PyObject *__pyx_v_size) {
+  long *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   long __pyx_v_length;
   long __pyx_v_i;
@@ -1001,11 +1013,9 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":298 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":298 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":299 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 299; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -1014,7 +1024,7 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":301 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":301 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1032,20 +1042,18 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":302 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":302 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":303 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":303 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":304 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":304 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":305 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":306 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":306 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1066,8 +1074,8 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_
   return __pyx_r;
 }
 
-static PyObject *__pyx_f_6mtrand_discnp_array_sc(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*),long ,double )),PyObject *__pyx_v_size,long __pyx_v_n,double __pyx_v_p) {
-  long (*__pyx_v_array_data);
+static PyObject *__pyx_f_6mtrand_discnp_array_sc(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_discnp __pyx_v_func,PyObject *__pyx_v_size,long __pyx_v_n,double __pyx_v_p) {
+  long *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   long __pyx_v_length;
   long __pyx_v_i;
@@ -1079,11 +1087,9 @@ static PyObject *__pyx_f_6mtrand_discnp_array_sc(rk_state (*__pyx_v_state),long
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":314 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":314 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":315 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -1092,7 +1098,7 @@ static PyObject *__pyx_f_6mtrand_discnp_array_sc(rk_state (*__pyx_v_state),long
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":317 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":317 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1110,20 +1116,18 @@ static PyObject *__pyx_f_6mtrand_discnp_array_sc(rk_state (*__pyx_v_state),long
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":318 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":318 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":319 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":319 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":320 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":320 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":321 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p);
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":322 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":322 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1146,14 +1150,14 @@ static PyObject *__pyx_f_6mtrand_discnp_array_sc(rk_state (*__pyx_v_state),long
 
 static PyObject *__pyx_k64p;
 
-static char (__pyx_k64[]) = "size is not compatible with inputs";
+static char __pyx_k64[] = "size is not compatible with inputs";
 
-static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*),long ,double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_on,PyArrayObject *__pyx_v_op) {
-  long (*__pyx_v_array_data);
+static PyObject *__pyx_f_6mtrand_discnp_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_discnp __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_on,PyArrayObject *__pyx_v_op) {
+  long *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   npy_intp __pyx_v_i;
-  double (*__pyx_v_op_data);
-  long (*__pyx_v_on_data);
+  double *__pyx_v_op_data;
+  long *__pyx_v_on_data;
   PyArrayMultiIterObject *__pyx_v_multi;
   PyObject *__pyx_r;
   int __pyx_1;
@@ -1167,48 +1171,48 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((*
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":333 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":333 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":334 */
-    __pyx_2 = PyArray_MultiIterNew(2,((void (*))__pyx_v_on),((void (*))__pyx_v_op)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 334; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":334 */
+    __pyx_2 = PyArray_MultiIterNew(2,((void *)__pyx_v_on),((void *)__pyx_v_op)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 334; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":335 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":335 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":336 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":336 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":337 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":337 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":338 */
-      __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":338 */
+      __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":339 */
-      __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":339 */
+      __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":340 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":340 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":341 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":341 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":343 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":343 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 343; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 343; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1226,21 +1230,19 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((*
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":344 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":344 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":345 */
-    __pyx_4 = PyArray_MultiIterNew(3,((void (*))arrayObject),((void (*))__pyx_v_on),((void (*))__pyx_v_op)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":345 */
+    __pyx_4 = PyArray_MultiIterNew(3,((void *)arrayObject),((void *)__pyx_v_on),((void *)__pyx_v_op)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 345; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":346 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":346 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":347 */
       __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; goto __pyx_L1;}
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; goto __pyx_L1;}
       Py_INCREF(__pyx_k64p);
@@ -1255,29 +1257,29 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((*
     }
     __pyx_L5:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":348 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":348 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":349 */
-      __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":349 */
+      __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":350 */
-      __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":350 */
+      __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":351 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":351 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":352 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":352 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":353 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":353 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,2);
     }
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":355 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":355 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1299,8 +1301,8 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((*
   return __pyx_r;
 }
 
-static PyObject *__pyx_f_6mtrand_discnmN_array_sc(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*),long ,long ,long )),PyObject *__pyx_v_size,long __pyx_v_n,long __pyx_v_m,long __pyx_v_N) {
-  long (*__pyx_v_array_data);
+static PyObject *__pyx_f_6mtrand_discnmN_array_sc(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_discnmN __pyx_v_func,PyObject *__pyx_v_size,long __pyx_v_n,long __pyx_v_m,long __pyx_v_N) {
+  long *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   long __pyx_v_length;
   long __pyx_v_i;
@@ -1312,11 +1314,9 @@ static PyObject *__pyx_f_6mtrand_discnmN_array_sc(rk_state (*__pyx_v_state),long
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":364 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":364 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":365 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 365; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -1325,7 +1325,7 @@ static PyObject *__pyx_f_6mtrand_discnmN_array_sc(rk_state (*__pyx_v_state),long
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":367 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":367 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 367; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 367; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1343,20 +1343,18 @@ static PyObject *__pyx_f_6mtrand_discnmN_array_sc(rk_state (*__pyx_v_state),long
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":368 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":368 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":369 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":369 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":370 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":370 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":371 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N);
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":372 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":372 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1379,13 +1377,13 @@ static PyObject *__pyx_f_6mtrand_discnmN_array_sc(rk_state (*__pyx_v_state),long
 
 static PyObject *__pyx_k65p;
 
-static char (__pyx_k65[]) = "size is not compatible with inputs";
+static char __pyx_k65[] = "size is not compatible with inputs";
 
-static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*),long ,long ,long )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_on,PyArrayObject *__pyx_v_om,PyArrayObject *__pyx_v_oN) {
-  long (*__pyx_v_array_data);
-  long (*__pyx_v_on_data);
-  long (*__pyx_v_om_data);
-  long (*__pyx_v_oN_data);
+static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_discnmN __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_on,PyArrayObject *__pyx_v_om,PyArrayObject *__pyx_v_oN) {
+  long *__pyx_v_array_data;
+  long *__pyx_v_on_data;
+  long *__pyx_v_om_data;
+  long *__pyx_v_oN_data;
   PyArrayObject *arrayObject;
   npy_intp __pyx_v_i;
   PyArrayMultiIterObject *__pyx_v_multi;
@@ -1402,51 +1400,51 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long ((
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":385 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":385 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":386 */
-    __pyx_2 = PyArray_MultiIterNew(3,((void (*))__pyx_v_on),((void (*))__pyx_v_om),((void (*))__pyx_v_oN)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 386; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":386 */
+    __pyx_2 = PyArray_MultiIterNew(3,((void *)__pyx_v_on),((void *)__pyx_v_om),((void *)__pyx_v_oN)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 386; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":387 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":387 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 387; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":388 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":388 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":389 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":389 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":390 */
-      __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":390 */
+      __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,0));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":391 */
-      __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":391 */
+      __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":392 */
-      __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":392 */
+      __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":393 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":393 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":394 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":394 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":396 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":396 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; goto __pyx_L1;}
     __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1464,21 +1462,19 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long ((
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":397 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":397 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":398 */
-    __pyx_4 = PyArray_MultiIterNew(4,((void (*))arrayObject),((void (*))__pyx_v_on),((void (*))__pyx_v_om),((void (*))__pyx_v_oN)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 398; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":398 */
+    __pyx_4 = PyArray_MultiIterNew(4,((void *)arrayObject),((void *)__pyx_v_on),((void *)__pyx_v_om),((void *)__pyx_v_oN)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 398; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":400 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":400 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":401 */
       __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 401; goto __pyx_L1;}
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 401; goto __pyx_L1;}
       Py_INCREF(__pyx_k65p);
@@ -1493,29 +1489,29 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long ((
     }
     __pyx_L5:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":402 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":402 */
     __pyx_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":403 */
-      __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":403 */
+      __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":404 */
-      __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":404 */
+      __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,2));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":405 */
-      __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,3));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":405 */
+      __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,3));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":406 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":406 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":407 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":407 */
       PyArray_MultiIter_NEXT(__pyx_v_multi);
     }
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":409 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":409 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1538,8 +1534,8 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long ((
   return __pyx_r;
 }
 
-static PyObject *__pyx_f_6mtrand_discd_array_sc(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*),double )),PyObject *__pyx_v_size,double __pyx_v_a) {
-  long (*__pyx_v_array_data);
+static PyObject *__pyx_f_6mtrand_discd_array_sc(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_discd __pyx_v_func,PyObject *__pyx_v_size,double __pyx_v_a) {
+  long *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   long __pyx_v_length;
   long __pyx_v_i;
@@ -1551,11 +1547,9 @@ static PyObject *__pyx_f_6mtrand_discd_array_sc(rk_state (*__pyx_v_state),long (
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":417 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":417 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":418 */
     __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -1564,7 +1558,7 @@ static PyObject *__pyx_f_6mtrand_discd_array_sc(rk_state (*__pyx_v_state),long (
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":420 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":420 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1582,20 +1576,18 @@ static PyObject *__pyx_f_6mtrand_discd_array_sc(rk_state (*__pyx_v_state),long (
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":421 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":421 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":422 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":422 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":423 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":423 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":424 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a);
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":425 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":425 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -1618,11 +1610,11 @@ static PyObject *__pyx_f_6mtrand_discd_array_sc(rk_state (*__pyx_v_state),long (
 
 static PyObject *__pyx_k66p;
 
-static char (__pyx_k66[]) = "size is not compatible with inputs";
+static char __pyx_k66[] = "size is not compatible with inputs";
 
-static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*),double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa) {
-  long (*__pyx_v_array_data);
-  double (*__pyx_v_oa_data);
+static PyObject *__pyx_f_6mtrand_discd_array(rk_state *__pyx_v_state,__pyx_t_6mtrand_rk_discd __pyx_v_func,PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa) {
+  long *__pyx_v_array_data;
+  double *__pyx_v_oa_data;
   PyArrayObject *arrayObject;
   npy_intp __pyx_v_length;
   npy_intp __pyx_v_i;
@@ -1640,44 +1632,44 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":436 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":436 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":437 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":437 */
     __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
     Py_DECREF(((PyObject *)arrayObject));
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":438 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":438 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":439 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":439 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":440 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":440 */
     __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2)));
     Py_DECREF(((PyObject *)__pyx_v_itera));
     __pyx_v_itera = ((PyArrayIterObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":441 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":441 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":442 */
-      (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double (*))__pyx_v_itera->dataptr)[0]));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":442 */
+      (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double *)__pyx_v_itera->dataptr)[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":443 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":443 */
       PyArray_ITER_NEXT(__pyx_v_itera);
     }
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":445 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":445 */
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 445; goto __pyx_L1;}
     __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 445; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -1695,21 +1687,19 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_
     arrayObject = ((PyArrayObject *)__pyx_2);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":446 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":446 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":447 */
-    __pyx_3 = PyArray_MultiIterNew(2,((void (*))arrayObject),((void (*))__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":447 */
+    __pyx_3 = PyArray_MultiIterNew(2,((void *)arrayObject),((void *)__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3)));
     Py_DECREF(((PyObject *)__pyx_v_multi));
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":448 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":448 */
     __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":449 */
       __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 449; goto __pyx_L1;}
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 449; goto __pyx_L1;}
       Py_INCREF(__pyx_k66p);
@@ -1724,23 +1714,23 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_
     }
     __pyx_L5:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":450 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":450 */
     __pyx_5 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":451 */
-      __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1));
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":451 */
+      __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":452 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":452 */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":453 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":453 */
       PyArray_MultiIter_NEXTi(__pyx_v_multi,1);
     }
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":454 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":454 */
   Py_INCREF(((PyObject *)arrayObject));
   __pyx_r = ((PyObject *)arrayObject);
   goto __pyx_L0;
@@ -1762,7 +1752,7 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_
   return __pyx_r;
 }
 
-static double __pyx_f_6mtrand_kahan_sum(double (*__pyx_v_darr),long __pyx_v_n) {
+static double __pyx_f_6mtrand_kahan_sum(double *__pyx_v_darr,long __pyx_v_n) {
   double __pyx_v_c;
   double __pyx_v_y;
   double __pyx_v_t;
@@ -1770,29 +1760,29 @@ static double __pyx_f_6mtrand_kahan_sum(double (*__pyx_v_darr),long __pyx_v_n) {
   long __pyx_v_i;
   double __pyx_r;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":459 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":459 */
   __pyx_v_sum = (__pyx_v_darr[0]);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":460 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":460 */
   __pyx_v_c = 0.0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":461 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":461 */
   for (__pyx_v_i = 1; __pyx_v_i < __pyx_v_n; ++__pyx_v_i) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":462 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":462 */
     __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":463 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":463 */
     __pyx_v_t = (__pyx_v_sum + __pyx_v_y);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":464 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":464 */
     __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":465 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":465 */
     __pyx_v_sum = __pyx_v_t;
   }
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":466 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":466 */
   __pyx_r = __pyx_v_sum;
   goto __pyx_L0;
 
@@ -1814,10 +1804,10 @@ static int __pyx_f_6mtrand_11RandomState___init__(PyObject *__pyx_v_self, PyObje
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_seed);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":489 */
-  ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state (*))PyMem_Malloc((sizeof(rk_state ))));
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":489 */
+  ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state *)PyMem_Malloc((sizeof(rk_state))));
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":491 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":491 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_seed); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 491; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 491; goto __pyx_L1;}
   Py_INCREF(__pyx_v_seed);
@@ -1845,15 +1835,13 @@ static void __pyx_f_6mtrand_11RandomState___dealloc__(PyObject *__pyx_v_self); /
 static void __pyx_f_6mtrand_11RandomState___dealloc__(PyObject *__pyx_v_self) {
   int __pyx_1;
   Py_INCREF(__pyx_v_self);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":494 */
   __pyx_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != NULL);
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":495 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":495 */
     PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":496 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":496 */
     ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = NULL;
     goto __pyx_L2;
   }
@@ -1883,11 +1871,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb
   Py_INCREF(__pyx_v_seed);
   arrayObject_obj = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":510 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":510 */
   __pyx_1 = __pyx_v_seed == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":511 */
     __pyx_v_errcode = rk_randomseed(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
@@ -1903,23 +1889,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":513 */
     __pyx_5 = PyInt_AsUnsignedLongMask(__pyx_v_seed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; goto __pyx_L1;}
     rk_seed(__pyx_5,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":515 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":515 */
     __pyx_3 = PyArray_ContiguousFromObject(__pyx_v_seed,NPY_LONG,1,1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;}
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
     Py_DECREF(((PyObject *)arrayObject_obj));
     arrayObject_obj = ((PyArrayObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":516 */
-    init_by_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,((unsigned long (*))arrayObject_obj->data),(arrayObject_obj->dimensions[0]));
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":516 */
+    init_by_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,((unsigned long *)arrayObject_obj->data),(arrayObject_obj->dimensions[0]));
   }
   __pyx_L2:;
 
@@ -1958,7 +1942,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_self);
   arrayObject_state = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":525 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":525 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_empty); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -1979,10 +1963,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self,
   arrayObject_state = ((PyArrayObject *)__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":526 */
-  memcpy(((void (*))arrayObject_state->data),((void (*))((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key),(624 * (sizeof(long ))));
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":526 */
+  memcpy(((void *)arrayObject_state->data),((void *)((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key),(624 * (sizeof(long))));
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":527 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":527 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_asarray); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -2002,7 +1986,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self,
   arrayObject_state = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":528 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":528 */
   __pyx_1 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;}
   Py_INCREF(__pyx_n_MT19937);
@@ -2035,8 +2019,8 @@ static PyObject *__pyx_n_TypeError;
 static PyObject *__pyx_k69p;
 static PyObject *__pyx_k70p;
 
-static char (__pyx_k69[]) = "algorithm must be 'MT19937'";
-static char (__pyx_k70[]) = "state must be 624 longs";
+static char __pyx_k69[] = "algorithm must be 'MT19937'";
+static char __pyx_k70[] = "state must be 624 longs";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_set_state[] = "Set the state from a tuple.\n\n        state = (\'MT19937\', int key[624], int pos)\n\n        set_state(state)\n        ";
@@ -2051,6 +2035,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   PyObject *__pyx_2 = 0;
   int __pyx_3;
   PyObject *__pyx_4 = 0;
+  PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"state",0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_state)) return 0;
   Py_INCREF(__pyx_v_self);
@@ -2059,7 +2044,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   __pyx_v_algorithm_name = Py_None; Py_INCREF(Py_None);
   __pyx_v_key = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":539 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":539 */
   __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; goto __pyx_L1;}
   __pyx_2 = PyObject_GetItem(__pyx_v_state, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2067,12 +2052,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   __pyx_v_algorithm_name = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":540 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":540 */
   if (PyObject_Cmp(__pyx_v_algorithm_name, __pyx_n_MT19937, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 540; goto __pyx_L1;}
   __pyx_3 = __pyx_3 != 0;
   if (__pyx_3) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":541 */
     __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;}
     Py_INCREF(__pyx_k69p);
@@ -2087,8 +2070,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":542 */
-  __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, 0x7fffffff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":542 */
+  __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, PY_SSIZE_T_MAX); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;}
   __pyx_2 = PyObject_GetIter(__pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_4 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;}
@@ -2102,10 +2085,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   if (__Pyx_EndUnpack(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":543 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":543 */
   /*try:*/ {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":544 */
     __pyx_4 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_ULONG,1,1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L3;}
     Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
     Py_DECREF(((PyObject *)arrayObject_obj));
@@ -2118,37 +2099,35 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   Py_XDECREF(__pyx_2); __pyx_2 = 0;
   Py_XDECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":545 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":545 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_TypeError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;}
   __pyx_3 = PyErr_ExceptionMatches(__pyx_1);
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_3) {
     __Pyx_AddTraceback("mtrand.set_state");
-    __pyx_2 = __Pyx_GetExcValue(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;}
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":547 */
-    __pyx_4 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_LONG,1,1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 547; goto __pyx_L1;}
-    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
+    if (__Pyx_GetException(&__pyx_2, &__pyx_4, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;}
+    __pyx_5 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_LONG,1,1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 547; goto __pyx_L1;}
+    Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5)));
     Py_DECREF(((PyObject *)arrayObject_obj));
-    arrayObject_obj = ((PyArrayObject *)__pyx_4);
+    arrayObject_obj = ((PyArrayObject *)__pyx_5);
+    Py_DECREF(__pyx_5); __pyx_5 = 0;
+    Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
+    Py_DECREF(__pyx_1); __pyx_1 = 0;
     goto __pyx_L4;
   }
   goto __pyx_L1;
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":548 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":548 */
   __pyx_3 = ((arrayObject_obj->dimensions[0]) != 624);
   if (__pyx_3) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":549 */
-    __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;}
+    __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;}
     Py_INCREF(__pyx_k70p);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k70p);
-    __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;}
+    Py_DECREF(__pyx_5); __pyx_5 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_Raise(__pyx_4, 0, 0);
     Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -2157,10 +2136,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":550 */
-  memcpy(((void (*))((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key),((void (*))arrayObject_obj->data),(624 * (sizeof(long ))));
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":550 */
+  memcpy(((void *)((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key),((void *)arrayObject_obj->data),(624 * (sizeof(long))));
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":551 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":551 */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos;
 
   __pyx_r = Py_None; Py_INCREF(Py_None);
@@ -2169,6 +2148,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self,
   Py_XDECREF(__pyx_1);
   Py_XDECREF(__pyx_2);
   Py_XDECREF(__pyx_4);
+  Py_XDECREF(__pyx_5);
   __Pyx_AddTraceback("mtrand.RandomState.set_state");
   __pyx_r = 0;
   __pyx_L0:;
@@ -2188,8 +2168,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState___getstate__(PyObject *__pyx_v_se
   static char *__pyx_argnames[] = {0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":555 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 555; goto __pyx_L1;}
   __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 555; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2220,8 +2198,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState___setstate__(PyObject *__pyx_v_se
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_state)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_state);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":558 */
   __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_set_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; goto __pyx_L1;}
   Py_INCREF(__pyx_v_state);
@@ -2258,8 +2234,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState___reduce__(PyObject *__pyx_v_self
   static char *__pyx_argnames[] = {0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
   Py_INCREF(__pyx_v_self);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":561 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -2305,8 +2279,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_sample(PyObject *__pyx_v_s
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":569 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_double,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 569; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -2335,8 +2307,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_tomaxint(PyObject *__pyx_v_self,
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":576 */
   __pyx_1 = __pyx_f_6mtrand_disc0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_long,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 576; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -2356,7 +2326,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_tomaxint(PyObject *__pyx_v_self,
 
 static PyObject *__pyx_k71p;
 
-static char (__pyx_k71[]) = "low >= high";
+static char __pyx_k71[] = "low >= high";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_randint[] = "Return random integers x such that low <= x < high.\n\n        randint(low, high=None, size=None) -> random values\n\n        If high is None, then 0 <= x < low.\n        ";
@@ -2367,7 +2337,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P
   long __pyx_v_lo;
   long __pyx_v_hi;
   long __pyx_v_diff;
-  long (*__pyx_v_array_data);
+  long *__pyx_v_array_data;
   PyArrayObject *arrayObject;
   long __pyx_v_length;
   long __pyx_v_i;
@@ -2387,38 +2357,36 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P
   Py_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":591 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":591 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":592 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":592 */
     __pyx_v_lo = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":593 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":593 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 593; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
     goto __pyx_L2;
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":595 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":595 */
     __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 595; goto __pyx_L1;}
     __pyx_v_lo = __pyx_2;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":596 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":596 */
     __pyx_2 = PyInt_AsLong(__pyx_v_high); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; goto __pyx_L1;}
     __pyx_v_hi = __pyx_2;
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":598 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":598 */
   __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":599 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":599 */
   __pyx_1 = (__pyx_v_diff < 0);
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":600 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; goto __pyx_L1;}
     Py_INCREF(__pyx_k71p);
@@ -2433,12 +2401,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P
   }
   __pyx_L3:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":602 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":602 */
   __pyx_1 = __pyx_v_size == Py_None;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":603 */
-    __pyx_3 = PyInt_FromLong((((long )rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)) + __pyx_v_lo)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; goto __pyx_L1;}
+    __pyx_3 = PyInt_FromLong((((long)rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)) + __pyx_v_lo)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; goto __pyx_L1;}
     __pyx_r = __pyx_3;
     __pyx_3 = 0;
     goto __pyx_L0;
@@ -2446,7 +2412,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":605 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":605 */
     __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; goto __pyx_L1;}
     __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_empty); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -2464,20 +2430,18 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P
     arrayObject = ((PyArrayObject *)__pyx_3);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":606 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":606 */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":607 */
-    __pyx_v_array_data = ((long (*))arrayObject->data);
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":607 */
+    __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":608 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":608 */
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":609 */
-      (__pyx_v_array_data[__pyx_v_i]) = (__pyx_v_lo + ((long )rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)));
+      (__pyx_v_array_data[__pyx_v_i]) = (__pyx_v_lo + ((long)rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)));
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":610 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":610 */
     Py_INCREF(((PyObject *)arrayObject));
     __pyx_r = ((PyObject *)arrayObject);
     goto __pyx_L0;
@@ -2505,7 +2469,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_bytes(PyObject *__pyx_v_self, PyO
 static char __pyx_doc_6mtrand_11RandomState_bytes[] = "Return random bytes.\n\n        bytes(length) -> str\n        ";
 static PyObject *__pyx_f_6mtrand_11RandomState_bytes(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
   unsigned int __pyx_v_length;
-  void (*__pyx_v_bytes);
+  void *__pyx_v_bytes;
   PyObject *__pyx_v_bytestring;
   PyObject *__pyx_r;
   PyObject *__pyx_1 = 0;
@@ -2514,19 +2478,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_bytes(PyObject *__pyx_v_self, PyO
   Py_INCREF(__pyx_v_self);
   __pyx_v_bytestring = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":618 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":618 */
   __pyx_1 = PyString_FromStringAndSize(NULL,__pyx_v_length); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;}
   Py_DECREF(__pyx_v_bytestring);
   __pyx_v_bytestring = __pyx_1;
   __pyx_1 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":619 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":619 */
   __pyx_v_bytes = PyString_AS_STRING(__pyx_v_bytestring);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":620 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":620 */
   rk_fill(__pyx_v_bytes,__pyx_v_length,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":621 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":621 */
   Py_INCREF(__pyx_v_bytestring);
   __pyx_r = __pyx_v_bytestring;
   goto __pyx_L0;
@@ -2576,17 +2540,15 @@ static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, P
   __pyx_v_odiff = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_temp = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":632 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":632 */
   __pyx_v_flow = PyFloat_AsDouble(__pyx_v_low);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":633 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":633 */
   __pyx_v_fhigh = PyFloat_AsDouble(__pyx_v_high);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":634 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":634 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":635 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_flow,(__pyx_v_fhigh - __pyx_v_flow)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -2595,24 +2557,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, P
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":636 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":636 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":637 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":637 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_low,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_olow));
   __pyx_v_olow = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":638 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":638 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_high,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_ohigh));
   __pyx_v_ohigh = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":639 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":639 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_subtract); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -2628,17 +2590,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, P
   __pyx_v_temp = __pyx_4;
   __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":640 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":640 */
   Py_INCREF(__pyx_v_temp);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":642 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":642 */
   __pyx_3 = PyArray_EnsureArray(__pyx_v_temp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_odiff));
   __pyx_v_odiff = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":643 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":643 */
   __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_olow,__pyx_v_odiff); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 643; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -2664,7 +2626,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, P
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_len;
 static PyObject *__pyx_n_size;
 
 
@@ -2673,13 +2634,14 @@ static char __pyx_doc_6mtrand_11RandomState_rand[] = "Return an array of the giv
 static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
   PyObject *__pyx_v_args = 0;
   PyObject *__pyx_r;
-  PyObject *__pyx_1 = 0;
-  PyObject *__pyx_2 = 0;
+  Py_ssize_t __pyx_1;
+  int __pyx_2;
   PyObject *__pyx_3 = 0;
-  int __pyx_4;
+  PyObject *__pyx_4 = 0;
   PyObject *__pyx_5 = 0;
+  PyObject *__pyx_6 = 0;
   static char *__pyx_argnames[] = {0};
-  if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 0, &__pyx_v_args, 0) < 0) return 0;
+  if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 0, &__pyx_v_args, 0, 0) < 0) return 0;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) {
     Py_XDECREF(__pyx_args);
     Py_XDECREF(__pyx_kwds);
@@ -2687,44 +2649,28 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb
     return 0;
   }
   Py_INCREF(__pyx_v_self);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":656 */
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
-  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_args);
-  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_args);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
-  if (PyObject_Cmp(__pyx_3, __pyx_1, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
-  __pyx_4 = __pyx_4 == 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  if (__pyx_4) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":657 */
-    __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; goto __pyx_L1;}
-    __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; goto __pyx_L1;}
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_r = __pyx_3;
-    __pyx_3 = 0;
+  __pyx_1 = PyObject_Length(__pyx_v_args); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;}
+  __pyx_2 = (__pyx_1 == 0);
+  if (__pyx_2) {
+    __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; goto __pyx_L1;}
+    __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; goto __pyx_L1;}
+    Py_DECREF(__pyx_3); __pyx_3 = 0;
+    __pyx_r = __pyx_4;
+    __pyx_4 = 0;
     goto __pyx_L0;
     goto __pyx_L2;
   }
   /*else*/ {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":659 */
-    __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
-    __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
-    if (PyDict_SetItem(__pyx_3, __pyx_n_size, __pyx_v_args) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
-    __pyx_5 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
+    __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
+    __pyx_4 = PyTuple_New(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
+    __pyx_5 = PyDict_New(); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
+    if (PyDict_SetItem(__pyx_5, __pyx_n_size, __pyx_v_args) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
+    __pyx_6 = PyEval_CallObjectWithKeywords(__pyx_3, __pyx_4, __pyx_5); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
-    __pyx_r = __pyx_5;
-    __pyx_5 = 0;
+    Py_DECREF(__pyx_4); __pyx_4 = 0;
+    Py_DECREF(__pyx_5); __pyx_5 = 0;
+    __pyx_r = __pyx_6;
+    __pyx_6 = 0;
     goto __pyx_L0;
   }
   __pyx_L2:;
@@ -2732,10 +2678,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb
   __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
-  Py_XDECREF(__pyx_1);
-  Py_XDECREF(__pyx_2);
   Py_XDECREF(__pyx_3);
+  Py_XDECREF(__pyx_4);
   Py_XDECREF(__pyx_5);
+  Py_XDECREF(__pyx_6);
   __Pyx_AddTraceback("mtrand.RandomState.rand");
   __pyx_r = 0;
   __pyx_L0:;
@@ -2751,12 +2697,13 @@ static char __pyx_doc_6mtrand_11RandomState_randn[] = "Returns zero-mean, unit-v
 static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
   PyObject *__pyx_v_args = 0;
   PyObject *__pyx_r;
-  PyObject *__pyx_1 = 0;
-  PyObject *__pyx_2 = 0;
+  Py_ssize_t __pyx_1;
+  int __pyx_2;
   PyObject *__pyx_3 = 0;
-  int __pyx_4;
+  PyObject *__pyx_4 = 0;
+  PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {0};
-  if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 0, &__pyx_v_args, 0) < 0) return 0;
+  if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 0, &__pyx_v_args, 0, 0) < 0) return 0;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) {
     Py_XDECREF(__pyx_args);
     Py_XDECREF(__pyx_kwds);
@@ -2764,43 +2711,27 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO
     return 0;
   }
   Py_INCREF(__pyx_v_self);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":671 */
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 671; goto __pyx_L1;}
-  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 671; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_args);
-  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_args);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 671; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 671; goto __pyx_L1;}
-  if (PyObject_Cmp(__pyx_3, __pyx_1, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 671; goto __pyx_L1;}
-  __pyx_4 = __pyx_4 == 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  if (__pyx_4) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":672 */
-    __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 672; goto __pyx_L1;}
-    __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 672; goto __pyx_L1;}
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_r = __pyx_3;
-    __pyx_3 = 0;
+  __pyx_1 = PyObject_Length(__pyx_v_args); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 671; goto __pyx_L1;}
+  __pyx_2 = (__pyx_1 == 0);
+  if (__pyx_2) {
+    __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 672; goto __pyx_L1;}
+    __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 672; goto __pyx_L1;}
+    Py_DECREF(__pyx_3); __pyx_3 = 0;
+    __pyx_r = __pyx_4;
+    __pyx_4 = 0;
     goto __pyx_L0;
     goto __pyx_L2;
   }
   /*else*/ {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":674 */
-    __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;}
+    __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;}
+    __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;}
     Py_INCREF(__pyx_v_args);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_args);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_r = __pyx_3;
-    __pyx_3 = 0;
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_args);
+    __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;}
+    Py_DECREF(__pyx_3); __pyx_3 = 0;
+    Py_DECREF(__pyx_4); __pyx_4 = 0;
+    __pyx_r = __pyx_5;
+    __pyx_5 = 0;
     goto __pyx_L0;
   }
   __pyx_L2:;
@@ -2808,9 +2739,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO
   __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
-  Py_XDECREF(__pyx_1);
-  Py_XDECREF(__pyx_2);
   Py_XDECREF(__pyx_3);
+  Py_XDECREF(__pyx_4);
+  Py_XDECREF(__pyx_5);
   __Pyx_AddTraceback("mtrand.RandomState.randn");
   __pyx_r = 0;
   __pyx_L0:;
@@ -2841,16 +2772,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v
   Py_INCREF(__pyx_v_high);
   Py_INCREF(__pyx_v_size);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":683 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":683 */
   __pyx_1 = __pyx_v_high == Py_None;
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":684 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":684 */
     Py_INCREF(__pyx_v_low);
     Py_DECREF(__pyx_v_high);
     __pyx_v_high = __pyx_v_low;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":685 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":685 */
     __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;}
     Py_DECREF(__pyx_v_low);
     __pyx_v_low = __pyx_2;
@@ -2859,7 +2790,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":686 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":686 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;}
   __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;}
   __pyx_4 = PyNumber_Add(__pyx_v_high, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;}
@@ -2905,8 +2836,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_normal(PyObject *__pyx_v
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":694 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gauss,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 694; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -2930,8 +2859,8 @@ static PyObject *__pyx_n_less_equal;
 static PyObject *__pyx_k73p;
 static PyObject *__pyx_k74p;
 
-static char (__pyx_k73[]) = "scale <= 0";
-static char (__pyx_k74[]) = "scale <= 0";
+static char __pyx_k73[] = "scale <= 0";
+static char __pyx_k74[] = "scale <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_normal[] = "Normal distribution (mean=loc, stdev=scale).\n\n        normal(loc=0.0, scale=1.0, size=None) -> random values\n        ";
@@ -2961,21 +2890,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":704 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":704 */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":705 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":705 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":706 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":706 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":707 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":707 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":708 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;}
       Py_INCREF(__pyx_k73p);
@@ -2990,7 +2917,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":709 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":709 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -2999,24 +2926,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":711 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":711 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":713 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":713 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 713; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":714 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":714 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 714; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":715 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":715 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -3041,8 +2968,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":716 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 716; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 716; goto __pyx_L1;}
     Py_INCREF(__pyx_k74p);
@@ -3057,7 +2982,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":717 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":717 */
   __pyx_5 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -3087,10 +3012,10 @@ static PyObject *__pyx_k76p;
 static PyObject *__pyx_k77p;
 static PyObject *__pyx_k78p;
 
-static char (__pyx_k75[]) = "a <= 0";
-static char (__pyx_k76[]) = "b <= 0";
-static char (__pyx_k77[]) = "a <= 0";
-static char (__pyx_k78[]) = "b <= 0";
+static char __pyx_k75[] = "a <= 0";
+static char __pyx_k76[] = "b <= 0";
+static char __pyx_k77[] = "a <= 0";
+static char __pyx_k78[] = "b <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_beta[] = "Beta distribution over [0, 1].\n\n        beta(a, b, size=None) -> random values\n        ";
@@ -3118,21 +3043,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_ob = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":727 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":727 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":728 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":728 */
   __pyx_v_fb = PyFloat_AsDouble(__pyx_v_b);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":729 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":729 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":730 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":730 */
     __pyx_1 = (__pyx_v_fa <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":731 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;}
       Py_INCREF(__pyx_k75p);
@@ -3147,11 +3070,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":732 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":732 */
     __pyx_1 = (__pyx_v_fb <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":733 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;}
       Py_INCREF(__pyx_k76p);
@@ -3166,7 +3087,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":734 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":734 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_fa,__pyx_v_fb); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 734; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3175,24 +3096,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":736 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":736 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":738 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":738 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 738; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":739 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":739 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_b,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 739; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_ob));
   __pyx_v_ob = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":740 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":740 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -3217,8 +3138,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":741 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;}
     Py_INCREF(__pyx_k77p);
@@ -3233,7 +3152,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":742 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":742 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -3258,8 +3177,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
   __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":743 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;}
     Py_INCREF(__pyx_k78p);
@@ -3274,7 +3191,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":744 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":744 */
   __pyx_3 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_oa,__pyx_v_ob); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;}
   __pyx_r = __pyx_3;
   __pyx_3 = 0;
@@ -3302,8 +3219,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb
 static PyObject *__pyx_k79p;
 static PyObject *__pyx_k80p;
 
-static char (__pyx_k79[]) = "scale <= 0";
-static char (__pyx_k80[]) = "scale <= 0";
+static char __pyx_k79[] = "scale <= 0";
+static char __pyx_k80[] = "scale <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_exponential[] = "Exponential distribution.\n\n        exponential(scale=1.0, size=None) -> random values\n        ";
@@ -3327,18 +3244,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel
   Py_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":754 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":754 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":755 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":755 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":756 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":756 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":757 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;}
       Py_INCREF(__pyx_k79p);
@@ -3353,7 +3268,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":758 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":758 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3362,17 +3277,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":760 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":760 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":762 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":762 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 762; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":763 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":763 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3397,8 +3312,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":764 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 764; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 764; goto __pyx_L1;}
     Py_INCREF(__pyx_k80p);
@@ -3413,7 +3326,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":765 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":765 */
   __pyx_5 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_oscale); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 765; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -3447,8 +3360,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_exponential(PyObject *__
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":772 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_exponential,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 772; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -3469,8 +3380,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_exponential(PyObject *__
 static PyObject *__pyx_k81p;
 static PyObject *__pyx_k82p;
 
-static char (__pyx_k81[]) = "shape <= 0";
-static char (__pyx_k82[]) = "shape <= 0";
+static char __pyx_k81[] = "shape <= 0";
+static char __pyx_k82[] = "shape <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_standard_gamma[] = "Standard Gamma distribution.\n\n        standard_gamma(shape, size=None) -> random values\n        ";
@@ -3493,18 +3404,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_
   Py_INCREF(__pyx_v_size);
   __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":782 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":782 */
   __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":783 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":783 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":784 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":784 */
     __pyx_1 = (__pyx_v_fshape <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":785 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; goto __pyx_L1;}
       Py_INCREF(__pyx_k81p);
@@ -3519,7 +3428,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":786 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":786 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_fshape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 786; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3528,17 +3437,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":788 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":788 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":789 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":789 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oshape));
   __pyx_v_oshape = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":790 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":790 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -3563,8 +3472,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":791 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;}
     Py_INCREF(__pyx_k82p);
@@ -3579,7 +3486,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":792 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":792 */
   __pyx_5 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_oshape); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -3607,10 +3514,10 @@ static PyObject *__pyx_k84p;
 static PyObject *__pyx_k85p;
 static PyObject *__pyx_k86p;
 
-static char (__pyx_k83[]) = "shape <= 0";
-static char (__pyx_k84[]) = "scale <= 0";
-static char (__pyx_k85[]) = "shape <= 0";
-static char (__pyx_k86[]) = "scale <= 0";
+static char __pyx_k83[] = "shape <= 0";
+static char __pyx_k84[] = "scale <= 0";
+static char __pyx_k85[] = "shape <= 0";
+static char __pyx_k86[] = "scale <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_gamma[] = "Gamma distribution.\n\n        gamma(shape, scale=1.0, size=None) -> random values\n        ";
@@ -3639,21 +3546,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
   __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":802 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":802 */
   __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":803 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":803 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":804 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":804 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":805 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":805 */
     __pyx_1 = (__pyx_v_fshape <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":806 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;}
       Py_INCREF(__pyx_k83p);
@@ -3668,11 +3573,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":807 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":807 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":808 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;}
       Py_INCREF(__pyx_k84p);
@@ -3687,7 +3590,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":809 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":809 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_fshape,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3696,24 +3599,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":811 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":811 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":812 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":812 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oshape));
   __pyx_v_oshape = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":813 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":813 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":814 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":814 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -3738,8 +3641,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":815 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;}
     Py_INCREF(__pyx_k85p);
@@ -3754,7 +3655,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":816 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":816 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -3779,8 +3680,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
   __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":817 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;}
     Py_INCREF(__pyx_k86p);
@@ -3795,7 +3694,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":818 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":818 */
   __pyx_3 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_oshape,__pyx_v_oscale); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; goto __pyx_L1;}
   __pyx_r = __pyx_3;
   __pyx_3 = 0;
@@ -3825,10 +3724,10 @@ static PyObject *__pyx_k88p;
 static PyObject *__pyx_k89p;
 static PyObject *__pyx_k90p;
 
-static char (__pyx_k87[]) = "shape <= 0";
-static char (__pyx_k88[]) = "scale <= 0";
-static char (__pyx_k89[]) = "dfnum <= 0";
-static char (__pyx_k90[]) = "dfden <= 0";
+static char __pyx_k87[] = "shape <= 0";
+static char __pyx_k88[] = "scale <= 0";
+static char __pyx_k89[] = "dfnum <= 0";
+static char __pyx_k90[] = "dfden <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_f[] = "F distribution.\n\n        f(dfnum, dfden, size=None) -> random values\n        ";
@@ -3856,21 +3755,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
   __pyx_v_odfnum = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":828 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":828 */
   __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":829 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":829 */
   __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":830 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":830 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":831 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":831 */
     __pyx_1 = (__pyx_v_fdfnum <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":832 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; goto __pyx_L1;}
       Py_INCREF(__pyx_k87p);
@@ -3885,11 +3782,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":833 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":833 */
     __pyx_1 = (__pyx_v_fdfden <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":834 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; goto __pyx_L1;}
       Py_INCREF(__pyx_k88p);
@@ -3904,7 +3799,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":835 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":835 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_fdfnum,__pyx_v_fdfden); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -3913,24 +3808,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":837 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":837 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":839 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":839 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_odfnum));
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":840 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":840 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_odfden));
   __pyx_v_odfden = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":841 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":841 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -3955,8 +3850,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":842 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;}
     Py_INCREF(__pyx_k89p);
@@ -3971,7 +3864,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":843 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":843 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -3996,8 +3889,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
   __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":844 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;}
     Py_INCREF(__pyx_k90p);
@@ -4012,7 +3903,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":845 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":845 */
   __pyx_3 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_odfnum,__pyx_v_odfden); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; goto __pyx_L1;}
   __pyx_r = __pyx_3;
   __pyx_3 = 0;
@@ -4046,12 +3937,12 @@ static PyObject *__pyx_k94p;
 static PyObject *__pyx_k95p;
 static PyObject *__pyx_k96p;
 
-static char (__pyx_k91[]) = "dfnum <= 1";
-static char (__pyx_k92[]) = "dfden <= 0";
-static char (__pyx_k93[]) = "nonc < 0";
-static char (__pyx_k94[]) = "dfnum <= 1";
-static char (__pyx_k95[]) = "dfden <= 0";
-static char (__pyx_k96[]) = "nonc < 0";
+static char __pyx_k91[] = "dfnum <= 1";
+static char __pyx_k92[] = "dfden <= 0";
+static char __pyx_k93[] = "nonc < 0";
+static char __pyx_k94[] = "dfnum <= 1";
+static char __pyx_k95[] = "dfden <= 0";
+static char __pyx_k96[] = "nonc < 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_noncentral_f[] = "Noncentral F distribution.\n\n        noncentral_f(dfnum, dfden, nonc, size=None) -> random values\n        ";
@@ -4084,24 +3975,22 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":855 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":855 */
   __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":856 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":856 */
   __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":857 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":857 */
   __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":858 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":858 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":859 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":859 */
     __pyx_1 = (__pyx_v_fdfnum <= 1);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":860 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;}
       Py_INCREF(__pyx_k91p);
@@ -4116,11 +4005,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":861 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":861 */
     __pyx_1 = (__pyx_v_fdfden <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":862 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;}
       Py_INCREF(__pyx_k92p);
@@ -4135,11 +4022,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":863 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":863 */
     __pyx_1 = (__pyx_v_fnonc < 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":864 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; goto __pyx_L1;}
       Py_INCREF(__pyx_k93p);
@@ -4154,7 +4039,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
     }
     __pyx_L5:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":865 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":865 */
     __pyx_2 = __pyx_f_6mtrand_cont3_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_fdfnum,__pyx_v_fdfden,__pyx_v_fnonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4163,31 +4048,31 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":868 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":868 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":870 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":870 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 870; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_odfnum));
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":871 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":871 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_odfden));
   __pyx_v_odfden = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":872 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":872 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_ononc));
   __pyx_v_ononc = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":874 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":874 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -4212,8 +4097,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":875 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;}
     Py_INCREF(__pyx_k94p);
@@ -4228,7 +4111,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":876 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":876 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -4253,8 +4136,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":877 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;}
     Py_INCREF(__pyx_k95p);
@@ -4269,7 +4150,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   }
   __pyx_L7:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":878 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":878 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -4294,8 +4175,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":879 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;}
     Py_INCREF(__pyx_k96p);
@@ -4310,7 +4189,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
   }
   __pyx_L8:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":880 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":880 */
   __pyx_2 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_odfnum,__pyx_v_odfden,__pyx_v_ononc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 880; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -4340,8 +4219,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se
 static PyObject *__pyx_k97p;
 static PyObject *__pyx_k98p;
 
-static char (__pyx_k97[]) = "df <= 0";
-static char (__pyx_k98[]) = "df <= 0";
+static char __pyx_k97[] = "df <= 0";
+static char __pyx_k98[] = "df <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_chisquare[] = "Chi^2 distribution.\n\n        chisquare(df, size=None) -> random values\n        ";
@@ -4364,18 +4243,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":891 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":891 */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":892 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":892 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":893 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":893 */
     __pyx_1 = (__pyx_v_fdf <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":894 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; goto __pyx_L1;}
       Py_INCREF(__pyx_k97p);
@@ -4390,7 +4267,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self,
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":895 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":895 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_fdf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4399,17 +4276,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":897 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":897 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":899 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":899 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_odf));
   __pyx_v_odf = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":900 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":900 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -4434,8 +4311,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":901 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; goto __pyx_L1;}
     Py_INCREF(__pyx_k98p);
@@ -4450,7 +4325,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self,
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":902 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":902 */
   __pyx_5 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_odf); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -4478,10 +4353,10 @@ static PyObject *__pyx_k100p;
 static PyObject *__pyx_k101p;
 static PyObject *__pyx_k102p;
 
-static char (__pyx_k99[]) = "df <= 0";
-static char (__pyx_k100[]) = "nonc <= 0";
-static char (__pyx_k101[]) = "df <= 1";
-static char (__pyx_k102[]) = "nonc < 0";
+static char __pyx_k99[] = "df <= 0";
+static char __pyx_k100[] = "nonc <= 0";
+static char __pyx_k101[] = "df <= 1";
+static char __pyx_k102[] = "nonc < 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_noncentral_chisquare[] = "Noncentral Chi^2 distribution.\n\n        noncentral_chisquare(df, nonc, size=None) -> random values\n        ";
@@ -4509,21 +4384,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
   __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":911 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":911 */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":912 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":912 */
   __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":913 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":913 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":914 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":914 */
     __pyx_1 = (__pyx_v_fdf <= 1);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":915 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; goto __pyx_L1;}
       Py_INCREF(__pyx_k99p);
@@ -4538,11 +4411,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":916 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":916 */
     __pyx_1 = (__pyx_v_fnonc <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":917 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;}
       Py_INCREF(__pyx_k100p);
@@ -4557,7 +4428,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":918 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":918 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_fdf,__pyx_v_fnonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4566,24 +4437,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":921 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":921 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":923 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":923 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_odf));
   __pyx_v_odf = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":924 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":924 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_ononc));
   __pyx_v_ononc = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":925 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":925 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -4608,8 +4479,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":926 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;}
     Py_INCREF(__pyx_k101p);
@@ -4624,7 +4493,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":927 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":927 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -4649,8 +4518,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
   __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":928 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;}
     Py_INCREF(__pyx_k102p);
@@ -4665,7 +4532,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":929 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":929 */
   __pyx_3 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_odf,__pyx_v_ononc); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;}
   __pyx_r = __pyx_3;
   __pyx_3 = 0;
@@ -4701,8 +4568,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_cauchy(PyObject *__pyx_v
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_size);
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":937 */
   __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_cauchy,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -4723,8 +4588,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_cauchy(PyObject *__pyx_v
 static PyObject *__pyx_k103p;
 static PyObject *__pyx_k104p;
 
-static char (__pyx_k103[]) = "df <= 0";
-static char (__pyx_k104[]) = "df <= 0";
+static char __pyx_k103[] = "df <= 0";
+static char __pyx_k104[] = "df <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_standard_t[] = "Standard Student\'s t distribution with df degrees of freedom.\n\n        standard_t(df, size=None)\n        ";
@@ -4747,18 +4612,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self
   Py_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":947 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":947 */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":948 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":948 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":949 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":949 */
     __pyx_1 = (__pyx_v_fdf <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":950 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;}
       Py_INCREF(__pyx_k103p);
@@ -4773,7 +4636,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":951 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":951 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_fdf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4782,17 +4645,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":953 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":953 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":955 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":955 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_odf));
   __pyx_v_odf = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":956 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":956 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -4817,8 +4680,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":957 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;}
     Py_INCREF(__pyx_k104p);
@@ -4833,7 +4694,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":958 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":958 */
   __pyx_5 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_odf); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -4859,8 +4720,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self
 static PyObject *__pyx_k105p;
 static PyObject *__pyx_k106p;
 
-static char (__pyx_k105[]) = "kappa < 0";
-static char (__pyx_k106[]) = "kappa < 0";
+static char __pyx_k105[] = "kappa < 0";
+static char __pyx_k106[] = "kappa < 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_vonmises[] = "von Mises circular distribution with mode mu and dispersion parameter\n        kappa on [-pi, pi].\n\n        vonmises(mu, kappa, size=None)\n        ";
@@ -4888,21 +4749,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self,
   __pyx_v_omu = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_okappa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":969 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":969 */
   __pyx_v_fmu = PyFloat_AsDouble(__pyx_v_mu);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":970 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":970 */
   __pyx_v_fkappa = PyFloat_AsDouble(__pyx_v_kappa);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":971 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":971 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":972 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":972 */
     __pyx_1 = (__pyx_v_fkappa < 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":973 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;}
       Py_INCREF(__pyx_k105p);
@@ -4917,7 +4776,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self,
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":974 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":974 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_fmu,__pyx_v_fkappa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -4926,24 +4785,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":976 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":976 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":978 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":978 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_mu,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_omu));
   __pyx_v_omu = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":979 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":979 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_kappa,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 979; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_okappa));
   __pyx_v_okappa = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":980 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":980 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -4968,8 +4827,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":981 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; goto __pyx_L1;}
     Py_INCREF(__pyx_k106p);
@@ -4984,7 +4841,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self,
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":982 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":982 */
   __pyx_5 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_omu,__pyx_v_okappa); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 982; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -5012,8 +4869,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self,
 static PyObject *__pyx_k107p;
 static PyObject *__pyx_k108p;
 
-static char (__pyx_k107[]) = "a <= 0";
-static char (__pyx_k108[]) = "a <= 0";
+static char __pyx_k107[] = "a <= 0";
+static char __pyx_k108[] = "a <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_pareto[] = "Pareto distribution.\n\n        pareto(a, size=None)\n        ";
@@ -5036,18 +4893,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":992 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":992 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":993 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":993 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":994 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":994 */
     __pyx_1 = (__pyx_v_fa <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":995 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;}
       Py_INCREF(__pyx_k107p);
@@ -5062,7 +4917,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":996 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":996 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5071,17 +4926,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":998 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":998 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1000 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1000 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1000; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1001 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1001 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -5106,8 +4961,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1002 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; goto __pyx_L1;}
     Py_INCREF(__pyx_k108p);
@@ -5122,7 +4975,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1003 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1003 */
   __pyx_5 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_oa); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1003; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -5148,8 +5001,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py
 static PyObject *__pyx_k109p;
 static PyObject *__pyx_k110p;
 
-static char (__pyx_k109[]) = "a <= 0";
-static char (__pyx_k110[]) = "a <= 0";
+static char __pyx_k109[] = "a <= 0";
+static char __pyx_k110[] = "a <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_weibull[] = "Weibull distribution.\n\n        weibull(a, size=None)\n        ";
@@ -5172,18 +5025,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1013 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1013 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1014 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1014 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1015 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1015 */
     __pyx_1 = (__pyx_v_fa <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1016 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1016; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1016; goto __pyx_L1;}
       Py_INCREF(__pyx_k109p);
@@ -5198,7 +5049,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1017 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1017 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1017; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5207,17 +5058,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1019 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1019 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1021 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1021 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1021; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1022 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1022 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -5242,8 +5093,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1023 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;}
     Py_INCREF(__pyx_k110p);
@@ -5258,7 +5107,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1024 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1024 */
   __pyx_5 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_oa); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -5284,8 +5133,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P
 static PyObject *__pyx_k111p;
 static PyObject *__pyx_k112p;
 
-static char (__pyx_k111[]) = "a <= 0";
-static char (__pyx_k112[]) = "a <= 0";
+static char __pyx_k111[] = "a <= 0";
+static char __pyx_k112[] = "a <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_power[] = "Power distribution.\n\n        power(a, size=None)\n        ";
@@ -5308,18 +5157,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1034 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1034 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1035 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1035 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1036 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1036 */
     __pyx_1 = (__pyx_v_fa <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1037 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1037; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1037; goto __pyx_L1;}
       Py_INCREF(__pyx_k111p);
@@ -5334,7 +5181,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1038 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1038 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1038; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5343,17 +5190,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1040 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1040 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1042 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1042 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1042; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1043 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1043 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -5378,8 +5225,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1044 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; goto __pyx_L1;}
     Py_INCREF(__pyx_k112p);
@@ -5394,7 +5239,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1045 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1045 */
   __pyx_5 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_oa); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1045; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -5420,8 +5265,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO
 static PyObject *__pyx_k113p;
 static PyObject *__pyx_k114p;
 
-static char (__pyx_k113[]) = "scale <= 0";
-static char (__pyx_k114[]) = "scale <= 0";
+static char __pyx_k113[] = "scale <= 0";
+static char __pyx_k114[] = "scale <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_laplace[] = "Laplace distribution.\n        \n        laplace(loc=0.0, scale=1.0, size=None)\n        ";
@@ -5451,21 +5296,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1055 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1055 */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1056 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1056 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1057 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1057 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1058 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1058 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1059 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; goto __pyx_L1;}
       Py_INCREF(__pyx_k113p);
@@ -5480,7 +5323,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1060 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1060 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1060; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5489,24 +5332,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1062 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1062 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1063 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1063 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1063; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1063; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1064 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1064 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_4);
   __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1065 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1065 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -5531,8 +5374,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1066 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; goto __pyx_L1;}
     Py_INCREF(__pyx_k114p);
@@ -5547,7 +5388,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1067 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1067 */
   __pyx_5 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -5575,8 +5416,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P
 static PyObject *__pyx_k115p;
 static PyObject *__pyx_k116p;
 
-static char (__pyx_k115[]) = "scale <= 0";
-static char (__pyx_k116[]) = "scale <= 0";
+static char __pyx_k115[] = "scale <= 0";
+static char __pyx_k116[] = "scale <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_gumbel[] = "Gumbel distribution.\n        \n        gumbel(loc=0.0, scale=1.0, size=None)\n        ";
@@ -5606,21 +5447,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1077 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1077 */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1078 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1078 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1079 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1079 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1080 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1080 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1081 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1081; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1081; goto __pyx_L1;}
       Py_INCREF(__pyx_k115p);
@@ -5635,7 +5474,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1082 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1082 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5644,24 +5483,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1084 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1084 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1085 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1085 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1085; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1085; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1086 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1086 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_4);
   __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1087 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1087 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -5686,8 +5525,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1088 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;}
     Py_INCREF(__pyx_k116p);
@@ -5702,7 +5539,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1089 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1089 */
   __pyx_5 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -5730,8 +5567,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py
 static PyObject *__pyx_k117p;
 static PyObject *__pyx_k118p;
 
-static char (__pyx_k117[]) = "scale <= 0";
-static char (__pyx_k118[]) = "scale <= 0";
+static char __pyx_k117[] = "scale <= 0";
+static char __pyx_k118[] = "scale <= 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_logistic[] = "Logistic distribution.\n        \n        logistic(loc=0.0, scale=1.0, size=None)\n        ";
@@ -5761,21 +5598,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self,
   __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1099 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1099 */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1100 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1100 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1101 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1101 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1102 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1102 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1103 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; goto __pyx_L1;}
       Py_INCREF(__pyx_k117p);
@@ -5790,7 +5625,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self,
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1104 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1104 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5799,24 +5634,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1106 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1106 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1107 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1107 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1107; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1107; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oloc));
   __pyx_v_oloc = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1108 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1108 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1108; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1108; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_4);
   __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1109 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1109 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -5841,8 +5676,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1110 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; goto __pyx_L1;}
     Py_INCREF(__pyx_k118p);
@@ -5857,7 +5690,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self,
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1111 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1111 */
   __pyx_5 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1111; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -5885,8 +5718,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self,
 static PyObject *__pyx_k119p;
 static PyObject *__pyx_k120p;
 
-static char (__pyx_k119[]) = "sigma <= 0";
-static char (__pyx_k120[]) = "sigma <= 0.0";
+static char __pyx_k119[] = "sigma <= 0";
+static char __pyx_k120[] = "sigma <= 0.0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_lognormal[] = "Log-normal distribution.\n        \n        Note that the mean parameter is not the mean of this distribution, but \n        the underlying normal distribution.\n        \n            lognormal(mean, sigma) <=> exp(normal(mean, sigma))\n        \n        lognormal(mean=0.0, sigma=1.0, size=None)\n        ";
@@ -5916,21 +5749,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self,
   __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_osigma = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1126 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1126 */
   __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1127 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1127 */
   __pyx_v_fsigma = PyFloat_AsDouble(__pyx_v_sigma);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1129 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1129 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1130 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1130 */
     __pyx_1 = (__pyx_v_fsigma <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1131 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; goto __pyx_L1;}
       Py_INCREF(__pyx_k119p);
@@ -5945,7 +5776,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self,
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1132 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1132 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_fmean,__pyx_v_fsigma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -5954,24 +5785,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1134 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1134 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1136 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1136 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1136; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1136; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_omean));
   __pyx_v_omean = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1137 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1137 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_sigma,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_osigma));
   __pyx_v_osigma = ((PyArrayObject *)__pyx_4);
   __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1138 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1138 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -5996,8 +5827,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1139 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; goto __pyx_L1;}
     Py_INCREF(__pyx_k120p);
@@ -6012,7 +5841,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self,
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1140 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1140 */
   __pyx_5 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_omean,__pyx_v_osigma); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1140; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -6040,8 +5869,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self,
 static PyObject *__pyx_k121p;
 static PyObject *__pyx_k122p;
 
-static char (__pyx_k121[]) = "scale <= 0";
-static char (__pyx_k122[]) = "scale <= 0.0";
+static char __pyx_k121[] = "scale <= 0";
+static char __pyx_k122[] = "scale <= 0.0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_rayleigh[] = "Rayleigh distribution.\n        \n        rayleigh(scale=1.0, size=None)\n        ";
@@ -6065,18 +5894,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1150 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1150 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1152 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1152 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1153 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1153 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1154 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; goto __pyx_L1;}
       Py_INCREF(__pyx_k121p);
@@ -6091,7 +5918,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self,
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1155 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1155 */
     __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -6100,17 +5927,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1157 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1157 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1159 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1159 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1160 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1160 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -6135,8 +5962,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1161 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1161; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1161; goto __pyx_L1;}
     Py_INCREF(__pyx_k122p);
@@ -6151,7 +5976,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self,
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1162 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1162 */
   __pyx_5 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_oscale); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1162; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -6179,10 +6004,10 @@ static PyObject *__pyx_k124p;
 static PyObject *__pyx_k125p;
 static PyObject *__pyx_k126p;
 
-static char (__pyx_k123[]) = "mean <= 0";
-static char (__pyx_k124[]) = "scale <= 0";
-static char (__pyx_k125[]) = "mean <= 0.0";
-static char (__pyx_k126[]) = "scale <= 0.0";
+static char __pyx_k123[] = "mean <= 0";
+static char __pyx_k124[] = "scale <= 0";
+static char __pyx_k125[] = "mean <= 0.0";
+static char __pyx_k126[] = "scale <= 0.0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_wald[] = "Wald (inverse Gaussian) distribution.\n        \n        wald(mean, scale, size=None)\n        ";
@@ -6210,21 +6035,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
   __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1172 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1172 */
   __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1173 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1173 */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1174 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1174 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1175 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1175 */
     __pyx_1 = (__pyx_v_fmean <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1176 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; goto __pyx_L1;}
       Py_INCREF(__pyx_k123p);
@@ -6239,11 +6062,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1177 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1177 */
     __pyx_1 = (__pyx_v_fscale <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1178 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;}
       Py_INCREF(__pyx_k124p);
@@ -6258,7 +6079,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1179 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1179 */
     __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_fmean,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -6267,24 +6088,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1181 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1181 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1182 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1182 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1182; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1182; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_omean));
   __pyx_v_omean = ((PyArrayObject *)__pyx_3);
   __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1183 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1183 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;}
   if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;}
   Py_DECREF(((PyObject *)__pyx_v_oscale));
   __pyx_v_oscale = ((PyArrayObject *)__pyx_4);
   __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1184 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1184 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -6309,8 +6130,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1185 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; goto __pyx_L1;}
     Py_INCREF(__pyx_k125p);
@@ -6347,8 +6166,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
   __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1187 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;}
     Py_INCREF(__pyx_k126p);
@@ -6363,7 +6180,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1188 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1188 */
   __pyx_3 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_omean,__pyx_v_oscale); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; goto __pyx_L1;}
   __pyx_r = __pyx_3;
   __pyx_3 = 0;
@@ -6398,12 +6215,12 @@ static PyObject *__pyx_k130p;
 static PyObject *__pyx_k131p;
 static PyObject *__pyx_k132p;
 
-static char (__pyx_k127[]) = "left > mode";
-static char (__pyx_k128[]) = "mode > right";
-static char (__pyx_k129[]) = "left == right";
-static char (__pyx_k130[]) = "left > mode";
-static char (__pyx_k131[]) = "mode > right";
-static char (__pyx_k132[]) = "left == right";
+static char __pyx_k127[] = "left > mode";
+static char __pyx_k128[] = "mode > right";
+static char __pyx_k129[] = "left == right";
+static char __pyx_k130[] = "left > mode";
+static char __pyx_k131[] = "mode > right";
+static char __pyx_k132[] = "left == right";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_triangular[] = "Triangular distribution starting at left, peaking at mode, and \n        ending at right (left <= mode <= right).\n        \n        triangular(left, mode, right, size=None)\n        ";
@@ -6436,24 +6253,22 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   __pyx_v_omode = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_oright = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1201 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1201 */
   __pyx_v_fleft = PyFloat_AsDouble(__pyx_v_left);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1202 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1202 */
   __pyx_v_fright = PyFloat_AsDouble(__pyx_v_right);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1203 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1203 */
   __pyx_v_fmode = PyFloat_AsDouble(__pyx_v_mode);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1204 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1204 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1205 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1205 */
     __pyx_1 = (__pyx_v_fleft > __pyx_v_fmode);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1206 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1206; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1206; goto __pyx_L1;}
       Py_INCREF(__pyx_k127p);
@@ -6468,11 +6283,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1207 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1207 */
     __pyx_1 = (__pyx_v_fmode > __pyx_v_fright);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1208 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1208; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1208; goto __pyx_L1;}
       Py_INCREF(__pyx_k128p);
@@ -6487,11 +6300,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1209 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1209 */
     __pyx_1 = (__pyx_v_fleft == __pyx_v_fright);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1210 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; goto __pyx_L1;}
       Py_INCREF(__pyx_k129p);
@@ -6506,7 +6317,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
     }
     __pyx_L5:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1211 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1211 */
     __pyx_2 = __pyx_f_6mtrand_cont3_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_fleft,__pyx_v_fmode,__pyx_v_fright); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -6515,31 +6326,31 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1214 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1214 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1215 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1215 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_left,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oleft));
   __pyx_v_oleft = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1216 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1216 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_mode,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1216; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_omode));
   __pyx_v_omode = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1217 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1217 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_right,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_oright));
   __pyx_v_oright = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1219 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1219 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -6563,8 +6374,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1220 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1220; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1220; goto __pyx_L1;}
     Py_INCREF(__pyx_k130p);
@@ -6579,7 +6388,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1221 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1221 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -6603,8 +6412,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1222 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;}
     Py_INCREF(__pyx_k131p);
@@ -6619,7 +6426,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   }
   __pyx_L7:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1223 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1223 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -6643,8 +6450,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1224 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;}
     Py_INCREF(__pyx_k132p);
@@ -6659,7 +6464,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self
   }
   __pyx_L8:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1225 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1225 */
   __pyx_2 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_oleft,__pyx_v_omode,__pyx_v_oright); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -6693,12 +6498,12 @@ static PyObject *__pyx_k136p;
 static PyObject *__pyx_k137p;
 static PyObject *__pyx_k138p;
 
-static char (__pyx_k133[]) = "n <= 0";
-static char (__pyx_k134[]) = "p < 0";
-static char (__pyx_k135[]) = "p > 1";
-static char (__pyx_k136[]) = "n <= 0";
-static char (__pyx_k137[]) = "p < 0";
-static char (__pyx_k138[]) = "p > 1";
+static char __pyx_k133[] = "n <= 0";
+static char __pyx_k134[] = "p < 0";
+static char __pyx_k135[] = "p > 1";
+static char __pyx_k136[] = "n <= 0";
+static char __pyx_k137[] = "p < 0";
+static char __pyx_k138[] = "p > 1";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_binomial[] = "Binomial distribution of n trials and p probability of success.\n\n        binomial(n, p, size=None) -> random values\n        ";
@@ -6726,21 +6531,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1238 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1238 */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1239 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1239 */
   __pyx_v_ln = PyInt_AsLong(__pyx_v_n);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1240 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1240 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1241 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1241 */
     __pyx_1 = (__pyx_v_ln <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1242 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;}
       Py_INCREF(__pyx_k133p);
@@ -6755,11 +6558,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1243 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1243 */
     __pyx_1 = (__pyx_v_fp < 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1244 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;}
       Py_INCREF(__pyx_k134p);
@@ -6774,8 +6575,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
     }
     __pyx_1 = (__pyx_v_fp > 1);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1246 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; goto __pyx_L1;}
       Py_INCREF(__pyx_k135p);
@@ -6790,7 +6589,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1247 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1247 */
     __pyx_2 = __pyx_f_6mtrand_discnp_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_ln,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -6799,24 +6598,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1249 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1249 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1251 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1251 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_on));
   __pyx_v_on = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1252 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1252 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1253 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1253 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -6841,8 +6640,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1254 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;}
     Py_INCREF(__pyx_k136p);
@@ -6857,7 +6654,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1255 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1255 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -6882,8 +6679,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1256 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;}
     Py_INCREF(__pyx_k137p);
@@ -6898,7 +6693,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1257 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1257 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -6923,8 +6718,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1258 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;}
     Py_INCREF(__pyx_k138p);
@@ -6939,7 +6732,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self,
   }
   __pyx_L7:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1259 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1259 */
   __pyx_4 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_on,__pyx_v_op); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -6971,12 +6764,12 @@ static PyObject *__pyx_k142p;
 static PyObject *__pyx_k143p;
 static PyObject *__pyx_k144p;
 
-static char (__pyx_k139[]) = "n <= 0";
-static char (__pyx_k140[]) = "p < 0";
-static char (__pyx_k141[]) = "p > 1";
-static char (__pyx_k142[]) = "n <= 0";
-static char (__pyx_k143[]) = "p < 0";
-static char (__pyx_k144[]) = "p > 1";
+static char __pyx_k139[] = "n <= 0";
+static char __pyx_k140[] = "p < 0";
+static char __pyx_k141[] = "p > 1";
+static char __pyx_k142[] = "n <= 0";
+static char __pyx_k143[] = "p < 0";
+static char __pyx_k144[] = "p > 1";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_negative_binomial[] = "Negative Binomial distribution.\n\n        negative_binomial(n, p, size=None) -> random values\n        ";
@@ -7004,21 +6797,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1271 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1271 */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1272 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1272 */
   __pyx_v_ln = PyInt_AsLong(__pyx_v_n);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1273 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1273 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1274 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1274 */
     __pyx_1 = (__pyx_v_ln <= 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1275 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;}
       Py_INCREF(__pyx_k139p);
@@ -7033,11 +6824,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1276 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1276 */
     __pyx_1 = (__pyx_v_fp < 0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1277 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;}
       Py_INCREF(__pyx_k140p);
@@ -7052,8 +6841,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
     }
     __pyx_1 = (__pyx_v_fp > 1);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1279 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;}
       Py_INCREF(__pyx_k141p);
@@ -7068,7 +6855,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1280 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1280 */
     __pyx_2 = __pyx_f_6mtrand_discnp_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_ln,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -7077,24 +6864,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1283 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1283 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1285 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1285 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1285; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_on));
   __pyx_v_on = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1286 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1286 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1286; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1287 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1287 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -7119,8 +6906,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1288 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;}
     Py_INCREF(__pyx_k142p);
@@ -7135,7 +6920,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1289 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1289 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -7160,8 +6945,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1290 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;}
     Py_INCREF(__pyx_k143p);
@@ -7176,7 +6959,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1291 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1291 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -7201,8 +6984,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1292 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;}
     Py_INCREF(__pyx_k144p);
@@ -7217,7 +6998,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
   }
   __pyx_L7:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1293 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1293 */
   __pyx_4 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_on,__pyx_v_op); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;}
   __pyx_r = __pyx_4;
   __pyx_4 = 0;
@@ -7245,8 +7026,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx
 static PyObject *__pyx_k145p;
 static PyObject *__pyx_k146p;
 
-static char (__pyx_k145[]) = "lam < 0";
-static char (__pyx_k146[]) = "lam < 0";
+static char __pyx_k145[] = "lam < 0";
+static char __pyx_k146[] = "lam < 0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_poisson[] = "Poisson distribution.\n\n        poisson(lam=1.0, size=None) -> random values\n        ";
@@ -7270,21 +7051,19 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P
   Py_INCREF(__pyx_v_size);
   __pyx_v_olam = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1303 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1303 */
   __pyx_v_flam = PyFloat_AsDouble(__pyx_v_lam);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1304 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1304 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1305 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1305 */
     __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_v_lam, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1306 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;}
       Py_INCREF(__pyx_k145p);
@@ -7299,7 +7078,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1307 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1307 */
     __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_flam); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1307; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -7308,17 +7087,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1309 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1309 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1311 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1311 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_lam,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1311; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_olam));
   __pyx_v_olam = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1312 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1312 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -7343,8 +7122,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1313 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; goto __pyx_L1;}
     Py_INCREF(__pyx_k146p);
@@ -7359,7 +7136,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1314 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1314 */
   __pyx_5 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_olam); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -7385,8 +7162,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P
 static PyObject *__pyx_k147p;
 static PyObject *__pyx_k148p;
 
-static char (__pyx_k147[]) = "a <= 1.0";
-static char (__pyx_k148[]) = "a <= 1.0";
+static char __pyx_k147[] = "a <= 1.0";
+static char __pyx_k148[] = "a <= 1.0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_zipf[] = "Zipf distribution.\n        \n        zipf(a, size=None)\n        ";
@@ -7409,18 +7186,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb
   Py_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1324 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1324 */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1325 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1325 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1326 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1326 */
     __pyx_1 = (__pyx_v_fa <= 1.0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1327 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1327; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1327; goto __pyx_L1;}
       Py_INCREF(__pyx_k147p);
@@ -7435,7 +7210,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1328 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1328 */
     __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -7444,17 +7219,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1330 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1330 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1332 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1332 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1332; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_oa));
   __pyx_v_oa = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1333 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1333 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -7479,8 +7254,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1334 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1334; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1334; goto __pyx_L1;}
     Py_INCREF(__pyx_k148p);
@@ -7495,7 +7268,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1335 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1335 */
   __pyx_5 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_oa); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1335; goto __pyx_L1;}
   __pyx_r = __pyx_5;
   __pyx_5 = 0;
@@ -7523,10 +7296,10 @@ static PyObject *__pyx_k150p;
 static PyObject *__pyx_k151p;
 static PyObject *__pyx_k152p;
 
-static char (__pyx_k149[]) = "p < 0.0";
-static char (__pyx_k150[]) = "p > 1.0";
-static char (__pyx_k151[]) = "p < 0.0";
-static char (__pyx_k152[]) = "p > 1.0";
+static char __pyx_k149[] = "p < 0.0";
+static char __pyx_k150[] = "p > 1.0";
+static char __pyx_k151[] = "p < 0.0";
+static char __pyx_k152[] = "p > 1.0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_geometric[] = "Geometric distribution with p being the probability of \"success\" on\n        an individual trial.\n        \n        geometric(p, size=None)\n        ";
@@ -7549,18 +7322,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1346 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1346 */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1347 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1347 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1348 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1348 */
     __pyx_1 = (__pyx_v_fp < 0.0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1349 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; goto __pyx_L1;}
       Py_INCREF(__pyx_k149p);
@@ -7575,11 +7346,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1350 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1350 */
     __pyx_1 = (__pyx_v_fp > 1.0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1351 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;}
       Py_INCREF(__pyx_k150p);
@@ -7594,7 +7363,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1352 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1352 */
     __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1352; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -7603,17 +7372,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1354 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1354 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1357 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1357 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1357; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1358 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1358 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -7638,8 +7407,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1359 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1359; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1359; goto __pyx_L1;}
     Py_INCREF(__pyx_k151p);
@@ -7654,7 +7421,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1360 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1360 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -7679,8 +7446,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1361 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;}
     Py_INCREF(__pyx_k152p);
@@ -7695,7 +7460,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self,
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1362 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1362 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_op); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1362; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -7729,14 +7494,14 @@ static PyObject *__pyx_k158p;
 static PyObject *__pyx_k159p;
 static PyObject *__pyx_k160p;
 
-static char (__pyx_k153[]) = "ngood < 1";
-static char (__pyx_k154[]) = "nbad < 1";
-static char (__pyx_k155[]) = "nsample < 1";
-static char (__pyx_k156[]) = "ngood + nbad < nsample";
-static char (__pyx_k157[]) = "ngood < 1";
-static char (__pyx_k158[]) = "nbad < 1";
-static char (__pyx_k159[]) = "nsample < 1";
-static char (__pyx_k160[]) = "ngood + nbad < nsample";
+static char __pyx_k153[] = "ngood < 1";
+static char __pyx_k154[] = "nbad < 1";
+static char __pyx_k155[] = "nsample < 1";
+static char __pyx_k156[] = "ngood + nbad < nsample";
+static char __pyx_k157[] = "ngood < 1";
+static char __pyx_k158[] = "nbad < 1";
+static char __pyx_k159[] = "nsample < 1";
+static char __pyx_k160[] = "ngood + nbad < nsample";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_hypergeometric[] = "Hypergeometric distribution.\n        \n        Consider an urn with ngood \"good\" balls and nbad \"bad\" balls. If one \n        were to draw nsample balls from the urn without replacement, then \n        the hypergeometric distribution describes the distribution of \"good\" \n        balls in the sample.\n        \n        hypergeometric(ngood, nbad, nsample, size=None)        \n        ";
@@ -7770,27 +7535,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   __pyx_v_onbad = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
   __pyx_v_onsample = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1377 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1377 */
   __pyx_v_lngood = PyInt_AsLong(__pyx_v_ngood);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1378 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1378 */
   __pyx_v_lnbad = PyInt_AsLong(__pyx_v_nbad);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1379 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1379 */
   __pyx_v_lnsample = PyInt_AsLong(__pyx_v_nsample);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1380 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1380 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1381 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1381 */
     __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1381; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_v_ngood, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1381; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1382 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1382; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1382; goto __pyx_L1;}
       Py_INCREF(__pyx_k153p);
@@ -7805,14 +7568,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1383 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1383 */
     __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1383; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_v_nbad, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1383; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1384 */
       __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;}
       __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;}
       Py_INCREF(__pyx_k154p);
@@ -7827,14 +7588,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1385 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1385 */
     __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1385; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_v_nsample, __pyx_3, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1385; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1386 */
       __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1386; goto __pyx_L1;}
       __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1386; goto __pyx_L1;}
       Py_INCREF(__pyx_k155p);
@@ -7849,14 +7608,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
     }
     __pyx_L5:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1387 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1387 */
     __pyx_4 = PyNumber_Add(__pyx_v_ngood, __pyx_v_nbad); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1387; goto __pyx_L1;}
     if (PyObject_Cmp(__pyx_4, __pyx_v_nsample, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1387; goto __pyx_L1;}
     __pyx_1 = __pyx_1 < 0;
     Py_DECREF(__pyx_4); __pyx_4 = 0;
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1388 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1388; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1388; goto __pyx_L1;}
       Py_INCREF(__pyx_k156p);
@@ -7871,7 +7628,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
     }
     __pyx_L6:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1389 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1389 */
     __pyx_2 = __pyx_f_6mtrand_discnmN_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_lngood,__pyx_v_lnbad,__pyx_v_lnsample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1389; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -7880,31 +7637,31 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1393 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1393 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1395 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1395 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_ngood,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1395; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_ongood));
   __pyx_v_ongood = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1396 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1396 */
   __pyx_4 = PyArray_FROM_OTF(__pyx_v_nbad,NPY_LONG,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1396; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4)));
   Py_DECREF(((PyObject *)__pyx_v_onbad));
   __pyx_v_onbad = ((PyArrayObject *)__pyx_4);
   Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1397 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1397 */
   __pyx_2 = PyArray_FROM_OTF(__pyx_v_nsample,NPY_LONG,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1397; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_onsample));
   __pyx_v_onsample = ((PyArrayObject *)__pyx_2);
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1398 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1398 */
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
@@ -7929,8 +7686,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1399 */
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1399; goto __pyx_L1;}
     __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1399; goto __pyx_L1;}
     Py_INCREF(__pyx_k157p);
@@ -7945,7 +7700,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   }
   __pyx_L7:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1400 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1400 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -7970,8 +7725,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1401 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;}
     Py_INCREF(__pyx_k158p);
@@ -7986,7 +7739,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   }
   __pyx_L8:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1402 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1402 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;}
   __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -8011,8 +7764,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1403 */
     __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;}
     Py_INCREF(__pyx_k159p);
@@ -8027,7 +7778,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   }
   __pyx_L9:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1404 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1404 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;}
   __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -8062,8 +7813,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1405 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;}
     Py_INCREF(__pyx_k160p);
@@ -8078,7 +7827,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_
   }
   __pyx_L10:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1406 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1406 */
   __pyx_6 = __pyx_f_6mtrand_discnmN_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_ongood,__pyx_v_onbad,__pyx_v_onsample); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1406; goto __pyx_L1;}
   __pyx_r = __pyx_6;
   __pyx_6 = 0;
@@ -8111,10 +7860,10 @@ static PyObject *__pyx_k162p;
 static PyObject *__pyx_k163p;
 static PyObject *__pyx_k164p;
 
-static char (__pyx_k161[]) = "p < 0.0";
-static char (__pyx_k162[]) = "p > 1.0";
-static char (__pyx_k163[]) = "p < 0.0";
-static char (__pyx_k164[]) = "p > 1.0";
+static char __pyx_k161[] = "p < 0.0";
+static char __pyx_k162[] = "p > 1.0";
+static char __pyx_k163[] = "p < 0.0";
+static char __pyx_k164[] = "p > 1.0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_logseries[] = "Logarithmic series distribution.\n        \n        logseries(p, size=None)\n        ";
@@ -8137,18 +7886,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
   Py_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1417 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1417 */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1418 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1418 */
   __pyx_1 = (!PyErr_Occurred());
   if (__pyx_1) {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1419 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1419 */
     __pyx_1 = (__pyx_v_fp < 0.0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1420 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1420; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1420; goto __pyx_L1;}
       Py_INCREF(__pyx_k161p);
@@ -8163,11 +7910,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
     }
     __pyx_L3:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1421 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1421 */
     __pyx_1 = (__pyx_v_fp > 1.0);
     if (__pyx_1) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1422 */
       __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; goto __pyx_L1;}
       __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; goto __pyx_L1;}
       Py_INCREF(__pyx_k162p);
@@ -8182,7 +7927,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
     }
     __pyx_L4:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1423 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1423 */
     __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1423; goto __pyx_L1;}
     __pyx_r = __pyx_2;
     __pyx_2 = 0;
@@ -8191,17 +7936,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1425 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1425 */
   PyErr_Clear();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1427 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1427 */
   __pyx_3 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1427; goto __pyx_L1;}
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3)));
   Py_DECREF(((PyObject *)__pyx_v_op));
   __pyx_v_op = ((PyArrayObject *)__pyx_3);
   Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1428 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1428 */
   __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;}
   Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -8226,8 +7971,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1429 */
     __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1429; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1429; goto __pyx_L1;}
     Py_INCREF(__pyx_k163p);
@@ -8242,7 +7985,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1430 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1430 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -8267,8 +8010,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
   __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__pyx_1) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1431 */
     __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;}
     __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;}
     Py_INCREF(__pyx_k164p);
@@ -8283,7 +8024,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1432 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1432 */
   __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_op); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1432; goto __pyx_L1;}
   __pyx_r = __pyx_2;
   __pyx_2 = 0;
@@ -8308,7 +8049,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self,
 
 static PyObject *__pyx_n_array;
 static PyObject *__pyx_n_shape;
-static PyObject *__pyx_n_isinstance;
 static PyObject *__pyx_n_list;
 static PyObject *__pyx_n_append;
 static PyObject *__pyx_n_multiply;
@@ -8323,10 +8063,10 @@ static PyObject *__pyx_k166p;
 static PyObject *__pyx_k167p;
 static PyObject *__pyx_k168p;
 
-static char (__pyx_k165[]) = "mean must be 1 dimensional";
-static char (__pyx_k166[]) = "cov must be 2 dimensional and square";
-static char (__pyx_k167[]) = "mean and cov must have same length";
-static char (__pyx_k168[]) = "numpy.dual";
+static char __pyx_k165[] = "mean must be 1 dimensional";
+static char __pyx_k166[] = "cov must be 2 dimensional and square";
+static char __pyx_k167[] = "mean and cov must have same length";
+static char __pyx_k168[] = "numpy.dual";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_multivariate_normal[] = "Return an array containing multivariate normally distributed random numbers\n        with specified mean and covariance.\n\n        multivariate_normal(mean, cov) -> random values\n        multivariate_normal(mean, cov, [m, n, ...]) -> random values\n\n        mean must be a 1 dimensional array. cov must be a square two dimensional\n        array with the same number of rows and columns as mean has elements.\n\n        The first form returns a single 1-D array containing a multivariate\n        normal.\n\n        The second form returns an array of shape (m, n, ..., cov.shape[0]).\n        In this case, output[i,j,...,:] is a 1-D array containing a multivariate\n        normal.\n        ";
@@ -8346,7 +8086,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   PyObject *__pyx_2 = 0;
   PyObject *__pyx_3 = 0;
   int __pyx_4;
-  PyObject *__pyx_5 = 0;
+  Py_ssize_t __pyx_5;
+  PyObject *__pyx_6 = 0;
   static char *__pyx_argnames[] = {"mean","cov","size",0};
   __pyx_v_size = __pyx_k58;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_mean, &__pyx_v_cov, &__pyx_v_size)) return 0;
@@ -8362,7 +8103,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   __pyx_v_s = Py_None; Py_INCREF(Py_None);
   __pyx_v_v = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1453 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1453 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1453; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1453; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -8376,7 +8117,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   __pyx_v_mean = __pyx_3;
   __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1454 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1454 */
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1454; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1454; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -8390,11 +8131,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   __pyx_v_cov = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1455 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1455 */
   __pyx_4 = __pyx_v_size == Py_None;
   if (__pyx_4) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1456 */
     __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1456; goto __pyx_L1;}
     Py_DECREF(__pyx_v_shape);
     __pyx_v_shape = __pyx_1;
@@ -8402,38 +8141,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
     goto __pyx_L2;
   }
   /*else*/ {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1458 */
     Py_INCREF(__pyx_v_size);
     Py_DECREF(__pyx_v_shape);
     __pyx_v_shape = __pyx_v_size;
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1459 */
-  __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;}
-  __pyx_2 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;}
-  __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2);
-  __pyx_2 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;}
-  if (PyObject_Cmp(__pyx_2, __pyx_3, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;}
-  __pyx_4 = __pyx_4 != 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1459 */
+  __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;}
+  __pyx_5 = PyObject_Length(__pyx_3); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_4 = (__pyx_5 != 1);
   if (__pyx_4) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1460 */
-    __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;}
+    __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;}
     Py_INCREF(__pyx_k165p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k165p);
-    __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
+    PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k165p);
+    __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
+    Py_DECREF(__pyx_1); __pyx_1 = 0;
     __Pyx_Raise(__pyx_3, 0, 0);
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;}
@@ -8441,291 +8167,255 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   }
   __pyx_L3:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1461 */
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1461 */
   __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
-  __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
-  __pyx_2 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_1 = PyInt_FromLong(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
-  if (PyObject_Cmp(__pyx_2, __pyx_1, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
-  __pyx_4 = __pyx_4 != 0;
+  __pyx_5 = PyObject_Length(__pyx_2); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_4 = (__pyx_5 != 2);
   if (!__pyx_4) {
-    __pyx_3 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
-    __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
-    __pyx_1 = PyObject_GetItem(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+    __pyx_1 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+    __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+    __pyx_2 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+    Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_3 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
-    __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
-    __pyx_5 = PyObject_GetItem(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+    __pyx_1 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+    __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+    __pyx_6 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+    Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
-    if (PyObject_Cmp(__pyx_1, __pyx_5, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
+    if (PyObject_Cmp(__pyx_2, __pyx_6, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;}
     __pyx_4 = __pyx_4 != 0;
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    Py_DECREF(__pyx_5); __pyx_5 = 0;
+    Py_DECREF(__pyx_2); __pyx_2 = 0;
+    Py_DECREF(__pyx_6); __pyx_6 = 0;
   }
   if (__pyx_4) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1462 */
-    __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;}
+    __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;}
+    __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;}
     Py_INCREF(__pyx_k166p);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k166p);
-    __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;}
+    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k166p);
+    __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;}
+    Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_3); __pyx_3 = 0;
+    __Pyx_Raise(__pyx_2, 0, 0);
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __Pyx_Raise(__pyx_1, 0, 0);
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;}
     goto __pyx_L4;
   }
   __pyx_L4:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1463 */
-  __pyx_5 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
-  __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
-  __pyx_2 = PyObject_GetItem(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_1 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
-  __pyx_5 = PyInt_FromLong(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
-  __pyx_3 = PyObject_GetItem(__pyx_1, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1463 */
+  __pyx_6 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
+  __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
+  __pyx_3 = PyObject_GetItem(__pyx_6, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  if (PyObject_Cmp(__pyx_2, __pyx_3, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
-  __pyx_4 = __pyx_4 != 0;
+  __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
+  __pyx_6 = PyInt_FromLong(0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
+  __pyx_1 = PyObject_GetItem(__pyx_2, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  if (PyObject_Cmp(__pyx_3, __pyx_1, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;}
+  __pyx_4 = __pyx_4 != 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1464 */
-    __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;}
-    __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;}
+    __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;}
+    __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;}
     Py_INCREF(__pyx_k167p);
-    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k167p);
-    __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    Py_DECREF(__pyx_5); __pyx_5 = 0;
-    __Pyx_Raise(__pyx_2, 0, 0);
+    PyTuple_SET_ITEM(__pyx_6, 0, __pyx_k167p);
+    __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_6); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
+    Py_DECREF(__pyx_6); __pyx_6 = 0;
+    __Pyx_Raise(__pyx_3, 0, 0);
+    Py_DECREF(__pyx_3); __pyx_3 = 0;
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;}
     goto __pyx_L5;
   }
   __pyx_L5:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1466 */
-  __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1466 */
   __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;}
-  __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_shape);
-  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_shape);
-  PyTuple_SET_ITEM(__pyx_5, 1, __pyx_1);
-  __pyx_1 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  __pyx_4 = PyObject_IsTrue(__pyx_2); if (__pyx_4 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_4 = PyObject_IsInstance(__pyx_v_shape,__pyx_1); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;}
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_4) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1467 */
-    __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1467; goto __pyx_L1;}
+    __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1467; goto __pyx_L1;}
     Py_INCREF(__pyx_v_shape);
-    PyList_SET_ITEM(__pyx_1, 0, __pyx_v_shape);
+    PyList_SET_ITEM(__pyx_2, 0, __pyx_v_shape);
     Py_DECREF(__pyx_v_shape);
-    __pyx_v_shape = __pyx_1;
-    __pyx_1 = 0;
+    __pyx_v_shape = __pyx_2;
+    __pyx_2 = 0;
     goto __pyx_L6;
   }
   __pyx_L6:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1468 */
-  __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_list); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;}
-  __pyx_5 = PySequence_GetSlice(__pyx_v_shape, 0, 0x7fffffff); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;}
-  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5);
-  __pyx_5 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1468 */
+  __pyx_6 = __Pyx_GetName(__pyx_b, __pyx_n_list); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;}
+  __pyx_3 = PySequence_GetSlice(__pyx_v_shape, 0, PY_SSIZE_T_MAX); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;}
+  __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_3);
+  __pyx_3 = 0;
+  __pyx_2 = PyObject_CallObject(__pyx_6, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_v_final_shape);
-  __pyx_v_final_shape = __pyx_1;
-  __pyx_1 = 0;
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1469 */
-  __pyx_5 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
-  __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
-  __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
-  __pyx_1 = PyObject_GetItem(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
-  __pyx_1 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_v_final_shape = __pyx_2;
+  __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1473 */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_standard_normal); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
-  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
-  __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_multiply); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_reduce); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1469 */
+  __pyx_3 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
+  __pyx_6 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
+  __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
+  __pyx_2 = PyObject_GetItem(__pyx_6, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_6, 0, __pyx_2);
+  __pyx_2 = 0;
+  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_final_shape);
-  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_final_shape);
-  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3);
-  __pyx_3 = 0;
-  __pyx_5 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_v_x);
-  __pyx_v_x = __pyx_5;
-  __pyx_5 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1474 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
-  __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1473 */
+  __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
+  __pyx_6 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_reduce); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
-  __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  __pyx_1 = PyObject_GetAttr(__pyx_6, __pyx_n_reduce); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
   Py_INCREF(__pyx_v_final_shape);
   PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_final_shape);
-  __pyx_1 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_5 = PyInt_FromLong(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
-  __pyx_3 = PyNumber_Subtract(__pyx_1, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  __pyx_6 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  __pyx_4 = PyInt_AsLong(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_1 = PySequence_GetSlice(__pyx_v_final_shape, 0, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
-  __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_1);
-  __pyx_1 = 0;
-  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_6);
+  __pyx_6 = 0;
+  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  __pyx_1 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; goto __pyx_L1;}
-  __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; goto __pyx_L1;}
-  __pyx_5 = PyObject_GetItem(__pyx_1, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
+  Py_DECREF(__pyx_v_x);
+  __pyx_v_x = __pyx_3;
+  __pyx_3 = 0;
+
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1474 */
+  __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  __pyx_2 = PyObject_GetAttr(__pyx_6, __pyx_n_multiply); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_reduce); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_3);
-  PyTuple_SET_ITEM(__pyx_1, 1, __pyx_5);
+  __pyx_5 = PyObject_Length(__pyx_v_final_shape); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  __pyx_3 = PySequence_GetSlice(__pyx_v_final_shape, 0, (__pyx_5 - 1)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_6, 0, __pyx_3);
   __pyx_3 = 0;
-  __pyx_5 = 0;
-  if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_6); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; goto __pyx_L1;}
+  __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; goto __pyx_L1;}
+  __pyx_6 = PyObject_GetItem(__pyx_3, __pyx_1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; goto __pyx_L1;}
+  Py_DECREF(__pyx_3); __pyx_3 = 0;
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
+  PyTuple_SET_ITEM(__pyx_3, 1, __pyx_6);
+  __pyx_2 = 0;
+  __pyx_6 = 0;
+  if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;}
+  Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1483 */
-  __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1483 */
+  __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;}
   Py_INCREF(__pyx_n_svd);
-  PyList_SET_ITEM(__pyx_2, 0, __pyx_n_svd);
-  __pyx_3 = __Pyx_Import(__pyx_k168p, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_svd); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;}
+  PyList_SET_ITEM(__pyx_1, 0, __pyx_n_svd);
+  __pyx_2 = __Pyx_Import(__pyx_k168p, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;}
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_6 = PyObject_GetAttr(__pyx_2, __pyx_n_svd); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;}
   Py_DECREF(__pyx_v_svd);
-  __pyx_v_svd = __pyx_5;
-  __pyx_5 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_v_svd = __pyx_6;
+  __pyx_6 = 0;
+  Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1485 */
-  __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1485 */
+  __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
   Py_INCREF(__pyx_v_cov);
-  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_cov);
-  __pyx_2 = PyObject_CallObject(__pyx_v_svd, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_cov);
+  __pyx_1 = PyObject_CallObject(__pyx_v_svd, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
+  Py_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_2 = PyObject_GetIter(__pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_3 = PyObject_GetIter(__pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_5 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
+  __pyx_6 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
   Py_DECREF(__pyx_v_u);
-  __pyx_v_u = __pyx_5;
-  __pyx_5 = 0;
-  __pyx_1 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
+  __pyx_v_u = __pyx_6;
+  __pyx_6 = 0;
+  __pyx_3 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
   Py_DECREF(__pyx_v_s);
-  __pyx_v_s = __pyx_1;
-  __pyx_1 = 0;
-  __pyx_2 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
+  __pyx_v_s = __pyx_3;
+  __pyx_3 = 0;
+  __pyx_1 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
   Py_DECREF(__pyx_v_v);
-  __pyx_v_v = __pyx_2;
-  __pyx_2 = 0;
-  if (__Pyx_EndUnpack(__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1486 */
-  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
-  __pyx_1 = PyObject_GetAttr(__pyx_5, __pyx_n_dot); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
-  __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_sqrt); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
+  __pyx_v_v = __pyx_1;
+  __pyx_1 = 0;
+  if (__Pyx_EndUnpack(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
+
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1486 */
+  __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
+  __pyx_3 = PyObject_GetAttr(__pyx_6, __pyx_n_dot); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
+  __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_sqrt); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
   Py_INCREF(__pyx_v_s);
-  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_s);
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  __pyx_3 = PyNumber_Multiply(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_6, 0, __pyx_v_s);
+  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_3);
-  Py_INCREF(__pyx_v_v);
-  PyTuple_SET_ITEM(__pyx_5, 1, __pyx_v_v);
-  __pyx_3 = 0;
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  __pyx_2 = PyNumber_Multiply(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  Py_DECREF(__pyx_v_x);
-  __pyx_v_x = __pyx_2;
+  __pyx_6 = PyTuple_New(2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_6, 0, __pyx_2);
+  Py_INCREF(__pyx_v_v);
+  PyTuple_SET_ITEM(__pyx_6, 1, __pyx_v_v);
   __pyx_2 = 0;
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1489 */
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;}
-  __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;}
+  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;}
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_5 = PyTuple_New(3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  Py_DECREF(__pyx_v_x);
+  __pyx_v_x = __pyx_1;
+  __pyx_1 = 0;
+
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1489 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;}
+  __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;}
+  Py_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_6 = PyTuple_New(3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;}
   Py_INCREF(__pyx_v_mean);
-  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_mean);
+  PyTuple_SET_ITEM(__pyx_6, 0, __pyx_v_mean);
   Py_INCREF(__pyx_v_x);
-  PyTuple_SET_ITEM(__pyx_5, 1, __pyx_v_x);
+  PyTuple_SET_ITEM(__pyx_6, 1, __pyx_v_x);
   Py_INCREF(__pyx_v_x);
-  PyTuple_SET_ITEM(__pyx_5, 2, __pyx_v_x);
-  __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_6, 2, __pyx_v_x);
+  __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;}
+  Py_DECREF(__pyx_3); __pyx_3 = 0;
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1490 */
-  __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
-  __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1490 */
+  __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
+  __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
   Py_INCREF(__pyx_v_final_shape);
-  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_final_shape);
-  __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_final_shape);
+  __pyx_6 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
+  Py_DECREF(__pyx_2); __pyx_2 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
+  if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;}
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1491 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1491 */
   Py_INCREF(__pyx_v_x);
   __pyx_r = __pyx_v_x;
   goto __pyx_L0;
@@ -8736,7 +8426,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p
   Py_XDECREF(__pyx_1);
   Py_XDECREF(__pyx_2);
   Py_XDECREF(__pyx_3);
-  Py_XDECREF(__pyx_5);
+  Py_XDECREF(__pyx_6);
   __Pyx_AddTraceback("mtrand.RandomState.multivariate_normal");
   __pyx_r = 0;
   __pyx_L0:;
@@ -8758,7 +8448,7 @@ static PyObject *__pyx_n_zeros;
 
 static PyObject *__pyx_k170p;
 
-static char (__pyx_k170[]) = "sum(pvals[:-1]) > 1.0";
+static char __pyx_k170[] = "sum(pvals[:-1]) > 1.0";
 
 static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_6mtrand_11RandomState_multinomial[] = "Multinomial distribution.\n        \n        multinomial(n, pvals, size=None) -> random values\n\n        pvals is a sequence of probabilities that should sum to 1 (however, the\n        last element is always assumed to account for the remaining probability\n        as long as sum(pvals[:-1]) <= 1).\n        ";
@@ -8769,8 +8459,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   long __pyx_v_d;
   PyArrayObject *arrayObject_parr;
   PyArrayObject *arrayObject_mnarr;
-  double (*__pyx_v_pix);
-  long (*__pyx_v_mnix);
+  double *__pyx_v_pix;
+  long *__pyx_v_mnix;
   long __pyx_v_i;
   long __pyx_v_j;
   long __pyx_v_dn;
@@ -8778,11 +8468,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   PyObject *__pyx_v_shape;
   PyObject *__pyx_v_multin;
   PyObject *__pyx_r;
-  PyObject *__pyx_1 = 0;
+  Py_ssize_t __pyx_1;
   PyObject *__pyx_2 = 0;
-  PyObject *__pyx_3 = 0;
-  long __pyx_4;
-  int __pyx_5;
+  int __pyx_3;
+  PyObject *__pyx_4 = 0;
+  PyObject *__pyx_5 = 0;
+  long __pyx_6;
   static char *__pyx_argnames[] = {"n","pvals","size",0};
   __pyx_v_size = __pyx_k59;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "lO|O", __pyx_argnames, &__pyx_v_n, &__pyx_v_pvals, &__pyx_v_size)) return 0;
@@ -8794,180 +8485,160 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   __pyx_v_shape = Py_None; Py_INCREF(Py_None);
   __pyx_v_multin = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1509 */
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1509; goto __pyx_L1;}
-  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1509; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_pvals);
-  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_pvals);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1509; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_4 = PyInt_AsLong(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1509; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_v_d = __pyx_4;
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1509 */
+  __pyx_1 = PyObject_Length(__pyx_v_pvals); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1509; goto __pyx_L1;}
+  __pyx_v_d = __pyx_1;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1510 */
-  __pyx_1 = PyArray_ContiguousFromObject(__pyx_v_pvals,NPY_DOUBLE,1,1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1510; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1510 */
+  __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_pvals,NPY_DOUBLE,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1510; goto __pyx_L1;}
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)arrayObject_parr));
-  arrayObject_parr = ((PyArrayObject *)__pyx_1);
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1511 */
-  __pyx_v_pix = ((double (*))arrayObject_parr->data);
+  arrayObject_parr = ((PyArrayObject *)__pyx_2);
+  Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1513 */
-  __pyx_5 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix,(__pyx_v_d - 1)) > (1.0 + 1e-12));
-  if (__pyx_5) {
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1511 */
+  __pyx_v_pix = ((double *)arrayObject_parr->data);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1514 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1513 */
+  __pyx_3 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix,(__pyx_v_d - 1)) > (1.0 + 1e-12));
+  if (__pyx_3) {
     __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;}
-    __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;}
+    __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;}
     Py_INCREF(__pyx_k170p);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k170p);
-    __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;}
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k170p);
+    __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
-    __Pyx_Raise(__pyx_1, 0, 0);
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
+    Py_DECREF(__pyx_4); __pyx_4 = 0;
+    __Pyx_Raise(__pyx_5, 0, 0);
+    Py_DECREF(__pyx_5); __pyx_5 = 0;
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;}
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1516 */
-  __pyx_5 = __pyx_v_size == Py_None;
-  if (__pyx_5) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1517 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1516 */
+  __pyx_3 = __pyx_v_size == Py_None;
+  if (__pyx_3) {
     __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1517; goto __pyx_L1;}
-    __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1517; goto __pyx_L1;}
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
+    __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1517; goto __pyx_L1;}
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
     __pyx_2 = 0;
     Py_DECREF(__pyx_v_shape);
-    __pyx_v_shape = __pyx_3;
-    __pyx_3 = 0;
+    __pyx_v_shape = __pyx_4;
+    __pyx_4 = 0;
     goto __pyx_L3;
   }
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;}
+  __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;}
   Py_INCREF(__pyx_v_size);
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;}
+  Py_DECREF(__pyx_5); __pyx_5 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;}
-  __pyx_5 = __pyx_3 == __pyx_1;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  if (__pyx_5) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1519 */
+  __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;}
+  __pyx_3 = __pyx_4 == __pyx_5;
+  Py_DECREF(__pyx_4); __pyx_4 = 0;
+  Py_DECREF(__pyx_5); __pyx_5 = 0;
+  if (__pyx_3) {
     __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1519; goto __pyx_L1;}
-    __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1519; goto __pyx_L1;}
+    __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1519; goto __pyx_L1;}
     Py_INCREF(__pyx_v_size);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_size);
-    PyTuple_SET_ITEM(__pyx_3, 1, __pyx_2);
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size);
+    PyTuple_SET_ITEM(__pyx_4, 1, __pyx_2);
     __pyx_2 = 0;
     Py_DECREF(__pyx_v_shape);
-    __pyx_v_shape = __pyx_3;
-    __pyx_3 = 0;
+    __pyx_v_shape = __pyx_4;
+    __pyx_4 = 0;
     goto __pyx_L3;
   }
   /*else*/ {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1521 */
-    __pyx_1 = PyInt_FromLong(__pyx_v_d); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;}
+    __pyx_5 = PyInt_FromLong(__pyx_v_d); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;}
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;}
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
-    __pyx_1 = 0;
-    __pyx_3 = PyNumber_Add(__pyx_v_size, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;}
+    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5);
+    __pyx_5 = 0;
+    __pyx_4 = PyNumber_Add(__pyx_v_size, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_v_shape);
-    __pyx_v_shape = __pyx_3;
-    __pyx_3 = 0;
+    __pyx_v_shape = __pyx_4;
+    __pyx_4 = 0;
   }
   __pyx_L3:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1523 */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
-  __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
-  __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1523 */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
+  __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
+  Py_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
+  __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
   Py_INCREF(__pyx_v_shape);
-  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_shape);
-  PyTuple_SET_ITEM(__pyx_1, 1, __pyx_3);
-  __pyx_3 = 0;
-  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_shape);
+  PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4);
+  __pyx_4 = 0;
+  __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  Py_DECREF(__pyx_5); __pyx_5 = 0;
   Py_DECREF(__pyx_v_multin);
-  __pyx_v_multin = __pyx_3;
-  __pyx_3 = 0;
+  __pyx_v_multin = __pyx_4;
+  __pyx_4 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1524 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1524 */
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_multin)));
   Py_DECREF(((PyObject *)arrayObject_mnarr));
   arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1525 */
-  __pyx_v_mnix = ((long (*))arrayObject_mnarr->data);
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1525 */
+  __pyx_v_mnix = ((long *)arrayObject_mnarr->data);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1526 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1526 */
   __pyx_v_i = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1527 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1527 */
   while (1) {
-    __pyx_5 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr));
-    if (!__pyx_5) break;
+    __pyx_3 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr));
+    if (!__pyx_3) break;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1528 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1528 */
     __pyx_v_Sum = 1.0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1529 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1529 */
     __pyx_v_dn = __pyx_v_n;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1530 */
-    __pyx_4 = (__pyx_v_d - 1);
-    for (__pyx_v_j = 0; __pyx_v_j < __pyx_4; ++__pyx_v_j) {
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1530 */
+    __pyx_6 = (__pyx_v_d - 1);
+    for (__pyx_v_j = 0; __pyx_v_j < __pyx_6; ++__pyx_v_j) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1531 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1531 */
       (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]) = rk_binomial(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,__pyx_v_dn,((__pyx_v_pix[__pyx_v_j]) / __pyx_v_Sum));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1532 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1532 */
       __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1533 */
-      __pyx_5 = (__pyx_v_dn <= 0);
-      if (__pyx_5) {
-
-        /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1534 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1533 */
+      __pyx_3 = (__pyx_v_dn <= 0);
+      if (__pyx_3) {
         goto __pyx_L7;
         goto __pyx_L8;
       }
       __pyx_L8:;
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1535 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1535 */
       __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j]));
     }
     __pyx_L7:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1536 */
-    __pyx_5 = (__pyx_v_dn > 0);
-    if (__pyx_5) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1537 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1536 */
+    __pyx_3 = (__pyx_v_dn > 0);
+    if (__pyx_3) {
       (__pyx_v_mnix[((__pyx_v_i + __pyx_v_d) - 1)]) = __pyx_v_dn;
       goto __pyx_L9;
     }
     __pyx_L9:;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1539 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1539 */
     __pyx_v_i = (__pyx_v_i + __pyx_v_d);
   }
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1541 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1541 */
   Py_INCREF(__pyx_v_multin);
   __pyx_r = __pyx_v_multin;
   goto __pyx_L0;
@@ -8975,9 +8646,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel
   __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
-  Py_XDECREF(__pyx_1);
   Py_XDECREF(__pyx_2);
-  Py_XDECREF(__pyx_3);
+  Py_XDECREF(__pyx_4);
+  Py_XDECREF(__pyx_5);
   __Pyx_AddTraceback("mtrand.RandomState.multinomial");
   __pyx_r = 0;
   __pyx_L0:;
@@ -9000,8 +8671,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_dirichlet(PyObject *__pyx_v_self,
   long __pyx_v_totsize;
   PyArrayObject *__pyx_v_alpha_arr;
   PyArrayObject *__pyx_v_val_arr;
-  double (*__pyx_v_alpha_data);
-  double (*__pyx_v_val_data);
+  double *__pyx_v_alpha_data;
+  double *__pyx_v_val_data;
   long __pyx_v_i;
   long __pyx_v_j;
   double __pyx_v_acc;
@@ -9009,11 +8680,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_dirichlet(PyObject *__pyx_v_self,
   PyObject *__pyx_v_shape;
   PyObject *__pyx_v_diric;
   PyObject *__pyx_r;
-  PyObject *__pyx_1 = 0;
+  Py_ssize_t __pyx_1;
   PyObject *__pyx_2 = 0;
-  PyObject *__pyx_3 = 0;
-  long __pyx_4;
-  int __pyx_5;
+  int __pyx_3;
+  PyObject *__pyx_4 = 0;
+  PyObject *__pyx_5 = 0;
   static char *__pyx_argnames[] = {"alpha","size",0};
   __pyx_v_size = __pyx_k60;
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_alpha, &__pyx_v_size)) return 0;
@@ -9025,148 +8696,132 @@ static PyObject *__pyx_f_6mtrand_11RandomState_dirichlet(PyObject *__pyx_v_self,
   __pyx_v_shape = Py_None; Py_INCREF(Py_None);
   __pyx_v_diric = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1598 */
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1598; goto __pyx_L1;}
-  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1598; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_alpha);
-  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_alpha);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1598; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_4 = PyInt_AsLong(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1598; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_v_k = __pyx_4;
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1598 */
+  __pyx_1 = PyObject_Length(__pyx_v_alpha); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1598; goto __pyx_L1;}
+  __pyx_v_k = __pyx_1;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1599 */
-  __pyx_1 = PyArray_ContiguousFromObject(__pyx_v_alpha,NPY_DOUBLE,1,1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1599; goto __pyx_L1;}
-  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1)));
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1599 */
+  __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_alpha,NPY_DOUBLE,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1599; goto __pyx_L1;}
+  Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2)));
   Py_DECREF(((PyObject *)__pyx_v_alpha_arr));
-  __pyx_v_alpha_arr = ((PyArrayObject *)__pyx_1);
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_alpha_arr = ((PyArrayObject *)__pyx_2);
+  Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1600 */
-  __pyx_v_alpha_data = ((double (*))__pyx_v_alpha_arr->data);
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1600 */
+  __pyx_v_alpha_data = ((double *)__pyx_v_alpha_arr->data);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1602 */
-  __pyx_5 = __pyx_v_size == Py_None;
-  if (__pyx_5) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1603 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1602 */
+  __pyx_3 = __pyx_v_size == Py_None;
+  if (__pyx_3) {
     __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1603; goto __pyx_L1;}
-    __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1603; goto __pyx_L1;}
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
+    __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1603; goto __pyx_L1;}
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
     __pyx_2 = 0;
     Py_DECREF(__pyx_v_shape);
-    __pyx_v_shape = __pyx_3;
-    __pyx_3 = 0;
+    __pyx_v_shape = __pyx_4;
+    __pyx_4 = 0;
     goto __pyx_L2;
   }
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;}
-  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;}
+  __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;}
   Py_INCREF(__pyx_v_size);
-  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size);
+  __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;}
-  __pyx_5 = __pyx_3 == __pyx_1;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  if (__pyx_5) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1605 */
-    __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1605; goto __pyx_L1;}
-    __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1605; goto __pyx_L1;}
+  Py_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;}
+  __pyx_3 = __pyx_5 == __pyx_2;
+  Py_DECREF(__pyx_5); __pyx_5 = 0;
+  Py_DECREF(__pyx_2); __pyx_2 = 0;
+  if (__pyx_3) {
+    __pyx_4 = PyInt_FromLong(__pyx_v_k); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1605; goto __pyx_L1;}
+    __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1605; goto __pyx_L1;}
     Py_INCREF(__pyx_v_size);
-    PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_size);
-    PyTuple_SET_ITEM(__pyx_3, 1, __pyx_2);
-    __pyx_2 = 0;
+    PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_size);
+    PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4);
+    __pyx_4 = 0;
     Py_DECREF(__pyx_v_shape);
-    __pyx_v_shape = __pyx_3;
-    __pyx_3 = 0;
+    __pyx_v_shape = __pyx_5;
+    __pyx_5 = 0;
     goto __pyx_L2;
   }
   /*else*/ {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1607 */
-    __pyx_1 = PyInt_FromLong(__pyx_v_k); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;}
-    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;}
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
-    __pyx_1 = 0;
-    __pyx_3 = PyNumber_Add(__pyx_v_size, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;}
-    Py_DECREF(__pyx_2); __pyx_2 = 0;
+    __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;}
+    __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;}
+    PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2);
+    __pyx_2 = 0;
+    __pyx_5 = PyNumber_Add(__pyx_v_size, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;}
+    Py_DECREF(__pyx_4); __pyx_4 = 0;
     Py_DECREF(__pyx_v_shape);
-    __pyx_v_shape = __pyx_3;
-    __pyx_3 = 0;
+    __pyx_v_shape = __pyx_5;
+    __pyx_5 = 0;
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1609 */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
-  __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
-  __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_float64); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_shape);
-  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_shape);
-  PyTuple_SET_ITEM(__pyx_3, 1, __pyx_1);
-  __pyx_1 = 0;
-  __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1609 */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
+  __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_zeros); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
+  __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_float64); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
+  Py_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
+  Py_INCREF(__pyx_v_shape);
+  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_shape);
+  PyTuple_SET_ITEM(__pyx_5, 1, __pyx_2);
+  __pyx_2 = 0;
+  __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;}
+  Py_DECREF(__pyx_4); __pyx_4 = 0;
+  Py_DECREF(__pyx_5); __pyx_5 = 0;
   Py_DECREF(__pyx_v_diric);
-  __pyx_v_diric = __pyx_1;
-  __pyx_1 = 0;
+  __pyx_v_diric = __pyx_2;
+  __pyx_2 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1610 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1610 */
   Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_diric)));
   Py_DECREF(((PyObject *)__pyx_v_val_arr));
   __pyx_v_val_arr = ((PyArrayObject *)__pyx_v_diric);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1611 */
-  __pyx_v_val_data = ((double (*))__pyx_v_val_arr->data);
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1611 */
+  __pyx_v_val_data = ((double *)__pyx_v_val_arr->data);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1613 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1613 */
   __pyx_v_i = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1614 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1614 */
   __pyx_v_totsize = PyArray_SIZE(__pyx_v_val_arr);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1615 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1615 */
   while (1) {
-    __pyx_5 = (__pyx_v_i < __pyx_v_totsize);
-    if (!__pyx_5) break;
+    __pyx_3 = (__pyx_v_i < __pyx_v_totsize);
+    if (!__pyx_3) break;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1616 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1616 */
     __pyx_v_acc = 0.0;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1617 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1617 */
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_v_k; ++__pyx_v_j) {
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1618 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1618 */
       (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = rk_standard_gamma(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,(__pyx_v_alpha_data[__pyx_v_j]));
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1619 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1619 */
       __pyx_v_acc = (__pyx_v_acc + (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]));
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1620 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1620 */
     __pyx_v_invacc = (1 / __pyx_v_acc);
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1621 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1621 */
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_v_k; ++__pyx_v_j) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1622 */
       (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = ((__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) * __pyx_v_invacc);
     }
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1623 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1623 */
     __pyx_v_i = (__pyx_v_i + __pyx_v_k);
   }
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1625 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1625 */
   Py_INCREF(__pyx_v_diric);
   __pyx_r = __pyx_v_diric;
   goto __pyx_L0;
@@ -9174,9 +8829,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_dirichlet(PyObject *__pyx_v_self,
   __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
-  Py_XDECREF(__pyx_1);
   Py_XDECREF(__pyx_2);
-  Py_XDECREF(__pyx_3);
+  Py_XDECREF(__pyx_4);
+  Py_XDECREF(__pyx_5);
   __Pyx_AddTraceback("mtrand.RandomState.dirichlet");
   __pyx_r = 0;
   __pyx_L0:;
@@ -9190,7 +8845,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_dirichlet(PyObject *__pyx_v_self,
   return __pyx_r;
 }
 
-static PyObject *__pyx_n_hasattr;
 static PyObject *__pyx_n_copy;
 
 
@@ -9202,192 +8856,155 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P
   long __pyx_v_j;
   int __pyx_v_copy;
   PyObject *__pyx_r;
-  PyObject *__pyx_1 = 0;
+  Py_ssize_t __pyx_1;
   PyObject *__pyx_2 = 0;
   PyObject *__pyx_3 = 0;
-  long __pyx_4;
+  PyObject *__pyx_4 = 0;
   int __pyx_5;
   static char *__pyx_argnames[] = {"x",0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_x)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_x);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1636 */
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1636; goto __pyx_L1;}
-  __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1636; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_x);
-  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x);
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1636; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_1 = PyInt_FromLong(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1636; goto __pyx_L1;}
-  __pyx_2 = PyNumber_Subtract(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1636; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_4 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1636; goto __pyx_L1;}
-  Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_v_i = __pyx_4;
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1636 */
+  __pyx_1 = PyObject_Length(__pyx_v_x); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1636; goto __pyx_L1;}
+  __pyx_v_i = (__pyx_1 - 1);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1637 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1637 */
   /*try:*/ {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1638 */
-    __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;}
-    __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;}
-    __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;}
-    PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2);
-    __pyx_2 = 0;
-    __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;}
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    __pyx_4 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;}
+    __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;}
+    __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
-    __pyx_v_j = __pyx_4;
+    __pyx_1 = PyObject_Length(__pyx_3); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;}
+    Py_DECREF(__pyx_3); __pyx_3 = 0;
+    __pyx_v_j = __pyx_1;
   }
   goto __pyx_L3;
   __pyx_L2:;
-  Py_XDECREF(__pyx_3); __pyx_3 = 0;
-  Py_XDECREF(__pyx_1); __pyx_1 = 0;
   Py_XDECREF(__pyx_2); __pyx_2 = 0;
+  Py_XDECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1639 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1639 */
   /*except:*/ {
     __Pyx_AddTraceback("mtrand.shuffle");
-    __pyx_3 = __Pyx_GetExcValue(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1639; goto __pyx_L1;}
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1640 */
+    if (__Pyx_GetException(&__pyx_2, &__pyx_3, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1639; goto __pyx_L1;}
     __pyx_v_j = 0;
+    Py_DECREF(__pyx_2); __pyx_2 = 0;
+    Py_DECREF(__pyx_3); __pyx_3 = 0;
+    Py_DECREF(__pyx_4); __pyx_4 = 0;
     goto __pyx_L3;
   }
   __pyx_L3:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1642 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1642 */
   __pyx_5 = (__pyx_v_j == 0);
   if (__pyx_5) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1644 */
     while (1) {
       __pyx_5 = (__pyx_v_i > 0);
       if (!__pyx_5) break;
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1645 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1645 */
       __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1646 */
-      __pyx_1 = PyInt_FromLong(__pyx_v_j); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
-      __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
-      Py_DECREF(__pyx_1); __pyx_1 = 0;
-      __pyx_3 = PyInt_FromLong(__pyx_v_i); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
-      __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1646 */
+      __pyx_2 = PyInt_FromLong(__pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
+      __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
+      Py_DECREF(__pyx_2); __pyx_2 = 0;
+      __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
+      __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
+      Py_DECREF(__pyx_4); __pyx_4 = 0;
+      __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
+      if (PyObject_SetItem(__pyx_v_x, __pyx_4, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
+      Py_DECREF(__pyx_4); __pyx_4 = 0;
       Py_DECREF(__pyx_3); __pyx_3 = 0;
-      __pyx_3 = PyInt_FromLong(__pyx_v_i); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
+      __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
       if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
       Py_DECREF(__pyx_3); __pyx_3 = 0;
       Py_DECREF(__pyx_2); __pyx_2 = 0;
-      __pyx_2 = PyInt_FromLong(__pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
-      if (PyObject_SetItem(__pyx_v_x, __pyx_2, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;}
-      Py_DECREF(__pyx_2); __pyx_2 = 0;
-      Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1647 */
+      /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1647 */
       __pyx_v_i = (__pyx_v_i - 1);
     }
     goto __pyx_L4;
   }
   /*else*/ {
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1650 */
-    __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_hasattr); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;}
-    __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;}
-    __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;}
-    PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2);
-    Py_INCREF(__pyx_n_copy);
-    PyTuple_SET_ITEM(__pyx_1, 1, __pyx_n_copy);
-    __pyx_2 = 0;
-    __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;}
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
-    __pyx_5 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;}
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1650 */
+    __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;}
+    __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;}
+    Py_DECREF(__pyx_4); __pyx_4 = 0;
+    __pyx_5 = PyObject_HasAttr(__pyx_2,__pyx_n_copy); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     __pyx_v_copy = __pyx_5;
 
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1651 */
+    /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1651 */
     __pyx_5 = __pyx_v_copy;
     if (__pyx_5) {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1652 */
       while (1) {
         __pyx_5 = (__pyx_v_i > 0);
         if (!__pyx_5) break;
 
-        /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1653 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1653 */
         __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1654 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1654 */
         __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
-        __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
+        __pyx_4 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
         Py_DECREF(__pyx_3); __pyx_3 = 0;
-        __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_copy); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
-        Py_DECREF(__pyx_1); __pyx_1 = 0;
+        __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_copy); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
+        Py_DECREF(__pyx_4); __pyx_4 = 0;
         __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
-        __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
-        __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
-        Py_DECREF(__pyx_1); __pyx_1 = 0;
-        __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_copy); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
+        __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
+        __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
+        Py_DECREF(__pyx_4); __pyx_4 = 0;
+        __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_copy); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
-        __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
-        Py_DECREF(__pyx_1); __pyx_1 = 0;
-        __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
-        if (PyObject_SetItem(__pyx_v_x, __pyx_1, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
-        Py_DECREF(__pyx_1); __pyx_1 = 0;
+        __pyx_2 = PyObject_CallObject(__pyx_4, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
+        Py_DECREF(__pyx_4); __pyx_4 = 0;
+        __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
+        if (PyObject_SetItem(__pyx_v_x, __pyx_4, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
+        Py_DECREF(__pyx_4); __pyx_4 = 0;
         Py_DECREF(__pyx_3); __pyx_3 = 0;
         __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
         if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;}
         Py_DECREF(__pyx_3); __pyx_3 = 0;
         Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-        /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1655 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1655 */
         __pyx_v_i = (__pyx_v_i - 1);
       }
       goto __pyx_L7;
     }
     /*else*/ {
-
-      /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1657 */
       while (1) {
         __pyx_5 = (__pyx_v_i > 0);
         if (!__pyx_5) break;
 
-        /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1658 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1658 */
         __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1659 */
-        __pyx_1 = PyInt_FromLong(__pyx_v_j); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
-        __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
-        Py_DECREF(__pyx_1); __pyx_1 = 0;
-        __pyx_3 = PySequence_GetSlice(__pyx_2, 0, 0x7fffffff); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1659 */
+        __pyx_4 = PyInt_FromLong(__pyx_v_j); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
+        __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
+        Py_DECREF(__pyx_4); __pyx_4 = 0;
+        __pyx_3 = PySequence_GetSlice(__pyx_2, 0, PY_SSIZE_T_MAX); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
-        __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
-        __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
-        Py_DECREF(__pyx_1); __pyx_1 = 0;
-        __pyx_1 = PySequence_GetSlice(__pyx_2, 0, 0x7fffffff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
+        __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
+        __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
+        Py_DECREF(__pyx_4); __pyx_4 = 0;
+        __pyx_4 = PySequence_GetSlice(__pyx_2, 0, PY_SSIZE_T_MAX); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         __pyx_2 = PyInt_FromLong(__pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
         if (PyObject_SetItem(__pyx_v_x, __pyx_2, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
         Py_DECREF(__pyx_2); __pyx_2 = 0;
         Py_DECREF(__pyx_3); __pyx_3 = 0;
         __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
-        if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
+        if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;}
         Py_DECREF(__pyx_3); __pyx_3 = 0;
-        Py_DECREF(__pyx_1); __pyx_1 = 0;
+        Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-        /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1660 */
+        /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1660 */
         __pyx_v_i = (__pyx_v_i - 1);
       }
     }
@@ -9398,9 +9015,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P
   __pyx_r = Py_None; Py_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1:;
-  Py_XDECREF(__pyx_1);
   Py_XDECREF(__pyx_2);
   Py_XDECREF(__pyx_3);
+  Py_XDECREF(__pyx_4);
   __Pyx_AddTraceback("mtrand.RandomState.shuffle");
   __pyx_r = 0;
   __pyx_L0:;
@@ -9421,81 +9038,67 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel
   PyObject *__pyx_1 = 0;
   PyObject *__pyx_2 = 0;
   PyObject *__pyx_3 = 0;
-  PyObject *__pyx_4 = 0;
-  int __pyx_5;
+  int __pyx_4;
   static char *__pyx_argnames[] = {"x",0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_x)) return 0;
   Py_INCREF(__pyx_v_self);
   Py_INCREF(__pyx_v_x);
   __pyx_v_arr = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1668 */
-  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
-  __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
-  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
-  __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_integer); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2);
-  PyTuple_SET_ITEM(__pyx_3, 1, __pyx_4);
-  __pyx_2 = 0;
-  __pyx_4 = 0;
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1668 */
+  __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
+  __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_integer); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
+  Py_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
-  Py_INCREF(__pyx_v_x);
-  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x);
+  PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
   PyTuple_SET_ITEM(__pyx_2, 1, __pyx_3);
+  __pyx_1 = 0;
   __pyx_3 = 0;
-  __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_4 = PyObject_IsInstance(__pyx_v_x,__pyx_2); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;}
-  Py_DECREF(__pyx_4); __pyx_4 = 0;
-  if (__pyx_5) {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1669 */
-    __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
-    __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_arange); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
-    Py_DECREF(__pyx_3); __pyx_3 = 0;
+  if (__pyx_4) {
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
+    __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_arange); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
+    Py_DECREF(__pyx_1); __pyx_1 = 0;
     __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
     Py_INCREF(__pyx_v_x);
     PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x);
-    __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;}
+    Py_DECREF(__pyx_3); __pyx_3 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     Py_DECREF(__pyx_v_arr);
-    __pyx_v_arr = __pyx_4;
-    __pyx_4 = 0;
+    __pyx_v_arr = __pyx_1;
+    __pyx_1 = 0;
     goto __pyx_L2;
   }
   /*else*/ {
-
-    /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1671 */
     __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;}
-    __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;}
+    __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;}
     Py_DECREF(__pyx_3); __pyx_3 = 0;
-    __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;}
+    __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;}
     Py_INCREF(__pyx_v_x);
-    PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x);
-    __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;}
-    Py_DECREF(__pyx_1); __pyx_1 = 0;
+    PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_x);
+    __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
+    Py_DECREF(__pyx_1); __pyx_1 = 0;
     Py_DECREF(__pyx_v_arr);
-    __pyx_v_arr = __pyx_4;
-    __pyx_4 = 0;
+    __pyx_v_arr = __pyx_3;
+    __pyx_3 = 0;
   }
   __pyx_L2:;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1672 */
-  __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;}
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1672 */
+  __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;}
   __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;}
   Py_INCREF(__pyx_v_arr);
   PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_arr);
-  __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  Py_DECREF(__pyx_3); __pyx_3 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1673 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1673 */
   Py_INCREF(__pyx_v_arr);
   __pyx_r = __pyx_v_arr;
   goto __pyx_L0;
@@ -9506,7 +9109,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel
   Py_XDECREF(__pyx_1);
   Py_XDECREF(__pyx_2);
   Py_XDECREF(__pyx_3);
-  Py_XDECREF(__pyx_4);
   __Pyx_AddTraceback("mtrand.RandomState.permutation");
   __pyx_r = 0;
   __pyx_L0:;
@@ -9546,13 +9148,10 @@ static __Pyx_InternTabEntry __pyx_intern_tab[] = {
   {&__pyx_n_get_state, "get_state"},
   {&__pyx_n_greater, "greater"},
   {&__pyx_n_gumbel, "gumbel"},
-  {&__pyx_n_hasattr, "hasattr"},
   {&__pyx_n_hypergeometric, "hypergeometric"},
   {&__pyx_n_int, "int"},
   {&__pyx_n_integer, "integer"},
-  {&__pyx_n_isinstance, "isinstance"},
   {&__pyx_n_laplace, "laplace"},
-  {&__pyx_n_len, "len"},
   {&__pyx_n_less, "less"},
   {&__pyx_n_less_equal, "less_equal"},
   {&__pyx_n_list, "list"},
@@ -9718,6 +9317,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
 
 static PyObject *__pyx_tp_new_6mtrand_RandomState(PyTypeObject *t, PyObject *a, PyObject *k) {
   PyObject *o = (*t->tp_alloc)(t, 0);
+  if (!o) return 0;
   return o;
 }
 
@@ -9835,6 +9435,9 @@ static PyNumberMethods __pyx_tp_as_number_RandomState = {
   0, /*nb_true_divide*/
   0, /*nb_inplace_floor_divide*/
   0, /*nb_inplace_true_divide*/
+  #if Py_TPFLAGS_DEFAULT & Py_TPFLAGS_HAVE_INDEX
+  0, /*nb_index*/
+  #endif
 };
 
 static PySequenceMethods __pyx_tp_as_sequence_RandomState = {
@@ -9941,6 +9544,7 @@ PyMODINIT_FUNC initmtrand(void) {
   __pyx_init_filenames();
   __pyx_m = Py_InitModule4("mtrand", __pyx_methods, 0, 0, PYTHON_API_VERSION);
   if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;};
+  Py_INCREF(__pyx_m);
   __pyx_b = PyImport_AddModule("__builtin__");
   if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;};
   if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;};
@@ -9954,37 +9558,37 @@ PyMODINIT_FUNC initmtrand(void) {
   if (PyObject_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; goto __pyx_L1;}
   __pyx_ptype_6mtrand_RandomState = &__pyx_type_6mtrand_RandomState;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":119 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":119 */
   import_array();
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":121 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":121 */
   __pyx_1 = __Pyx_Import(__pyx_n_numpy, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
   if (PyObject_SetAttr(__pyx_m, __pyx_n__sp, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":488 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":488 */
   Py_INCREF(Py_None);
   __pyx_k2 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":498 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":498 */
   Py_INCREF(Py_None);
   __pyx_k3 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":564 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":564 */
   Py_INCREF(Py_None);
   __pyx_k4 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":571 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":571 */
   Py_INCREF(Py_None);
   __pyx_k5 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":578 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":578 */
   Py_INCREF(Py_None);
   __pyx_k6 = Py_None;
   Py_INCREF(Py_None);
   __pyx_k7 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":623 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":623 */
   __pyx_1 = PyFloat_FromDouble(0.0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 623; goto __pyx_L1;}
   __pyx_k8 = __pyx_1;
   __pyx_1 = 0;
@@ -9994,17 +9598,17 @@ PyMODINIT_FUNC initmtrand(void) {
   Py_INCREF(Py_None);
   __pyx_k10 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":676 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":676 */
   Py_INCREF(Py_None);
   __pyx_k11 = Py_None;
   Py_INCREF(Py_None);
   __pyx_k12 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":689 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":689 */
   Py_INCREF(Py_None);
   __pyx_k13 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":696 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":696 */
   __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; goto __pyx_L1;}
   __pyx_k14 = __pyx_3;
   __pyx_3 = 0;
@@ -10014,73 +9618,73 @@ PyMODINIT_FUNC initmtrand(void) {
   Py_INCREF(Py_None);
   __pyx_k16 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":719 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":719 */
   Py_INCREF(Py_None);
   __pyx_k17 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":746 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":746 */
   __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 746; goto __pyx_L1;}
   __pyx_k18 = __pyx_5;
   __pyx_5 = 0;
   Py_INCREF(Py_None);
   __pyx_k19 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":767 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":767 */
   Py_INCREF(Py_None);
   __pyx_k20 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":774 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":774 */
   Py_INCREF(Py_None);
   __pyx_k21 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":794 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":794 */
   __pyx_6 = PyFloat_FromDouble(1.0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; goto __pyx_L1;}
   __pyx_k22 = __pyx_6;
   __pyx_6 = 0;
   Py_INCREF(Py_None);
   __pyx_k23 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":820 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":820 */
   Py_INCREF(Py_None);
   __pyx_k24 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":847 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":847 */
   Py_INCREF(Py_None);
   __pyx_k25 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":883 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":883 */
   Py_INCREF(Py_None);
   __pyx_k26 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":904 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":904 */
   Py_INCREF(Py_None);
   __pyx_k27 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":932 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":932 */
   Py_INCREF(Py_None);
   __pyx_k28 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":939 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":939 */
   Py_INCREF(Py_None);
   __pyx_k29 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":960 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":960 */
   Py_INCREF(Py_None);
   __pyx_k30 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":984 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":984 */
   Py_INCREF(Py_None);
   __pyx_k31 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1005 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1005 */
   Py_INCREF(Py_None);
   __pyx_k32 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1026 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1026 */
   Py_INCREF(Py_None);
   __pyx_k33 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1047 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1047 */
   __pyx_7 = PyFloat_FromDouble(0.0); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;}
   __pyx_k34 = __pyx_7;
   __pyx_7 = 0;
@@ -10090,7 +9694,7 @@ PyMODINIT_FUNC initmtrand(void) {
   Py_INCREF(Py_None);
   __pyx_k36 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1069 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1069 */
   __pyx_9 = PyFloat_FromDouble(0.0); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;}
   __pyx_k37 = __pyx_9;
   __pyx_9 = 0;
@@ -10100,7 +9704,7 @@ PyMODINIT_FUNC initmtrand(void) {
   Py_INCREF(Py_None);
   __pyx_k39 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1091 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1091 */
   __pyx_11 = PyFloat_FromDouble(0.0); if (!__pyx_11) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;}
   __pyx_k40 = __pyx_11;
   __pyx_11 = 0;
@@ -10110,7 +9714,7 @@ PyMODINIT_FUNC initmtrand(void) {
   Py_INCREF(Py_None);
   __pyx_k42 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1113 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1113 */
   __pyx_13 = PyFloat_FromDouble(0.0); if (!__pyx_13) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;}
   __pyx_k43 = __pyx_13;
   __pyx_13 = 0;
@@ -10120,385 +9724,385 @@ PyMODINIT_FUNC initmtrand(void) {
   Py_INCREF(Py_None);
   __pyx_k45 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1142 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1142 */
   __pyx_15 = PyFloat_FromDouble(1.0); if (!__pyx_15) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; goto __pyx_L1;}
   __pyx_k46 = __pyx_15;
   __pyx_15 = 0;
   Py_INCREF(Py_None);
   __pyx_k47 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1164 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1164 */
   Py_INCREF(Py_None);
   __pyx_k48 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1192 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1192 */
   Py_INCREF(Py_None);
   __pyx_k49 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1229 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1229 */
   Py_INCREF(Py_None);
   __pyx_k50 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1261 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1261 */
   Py_INCREF(Py_None);
   __pyx_k51 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1296 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1296 */
   __pyx_16 = PyFloat_FromDouble(1.0); if (!__pyx_16) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;}
   __pyx_k52 = __pyx_16;
   __pyx_16 = 0;
   Py_INCREF(Py_None);
   __pyx_k53 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1316 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1316 */
   Py_INCREF(Py_None);
   __pyx_k54 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1337 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1337 */
   Py_INCREF(Py_None);
   __pyx_k55 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1364 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1364 */
   Py_INCREF(Py_None);
   __pyx_k56 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1409 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1409 */
   Py_INCREF(Py_None);
   __pyx_k57 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1435 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1435 */
   Py_INCREF(Py_None);
   __pyx_k58 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1493 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1493 */
   Py_INCREF(Py_None);
   __pyx_k59 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1543 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1543 */
   Py_INCREF(Py_None);
   __pyx_k60 = Py_None;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1675 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1675 */
   __pyx_17 = PyObject_CallObject(((PyObject*)__pyx_ptype_6mtrand_RandomState), 0); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1675; goto __pyx_L1;}
   if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_17) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1675; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1676 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1676 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1676; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_seed); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1676; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_seed, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1676; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1677 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1677 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1677; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_get_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1677; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_get_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1677; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1678 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1678 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1678; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_set_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1678; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_set_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1678; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1679 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1679 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1679; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_sample); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1679; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_random_sample, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1679; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1680 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1680 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1680; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randint); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1680; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_randint, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1680; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1681 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1681 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1681; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_bytes); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1681; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_bytes, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1681; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1682 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1682 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_uniform); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_uniform, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1683 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1683 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1683; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rand); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1683; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_rand, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1683; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1684 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1684 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1684; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randn); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1684; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_randn, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1684; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1685 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1685 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1685; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_integers); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1685; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_random_integers, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1685; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1686 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1686 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1686; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1686; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1686; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1687 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1687 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1687; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1687; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1687; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1688 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1688 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1688; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_beta); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1688; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_beta, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1688; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1689 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1689 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1689; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1689; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1689; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1690 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1690 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1690; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1690; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1690; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1691 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1691 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1692 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1692 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1693 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1693 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1693; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1693; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1693; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1694 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1694 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1695 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1695 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1695; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1695; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1695; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1696 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1696 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1696; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1696; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1696; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1697 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1697 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1697; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_cauchy); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1697; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_cauchy, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1697; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1698 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1698 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1698; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_t); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1698; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_t, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1698; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1699 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1699 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1699; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_vonmises); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1699; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_vonmises, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1699; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1700 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1700 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1700; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_pareto); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1700; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_pareto, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1700; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1701 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1701 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_weibull); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_weibull, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1702 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1702 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_power); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_power, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1703 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1703 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1703; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_laplace); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1703; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_laplace, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1703; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1704 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1704 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1704; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gumbel); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1704; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_gumbel, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1704; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1705 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1705 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1705; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logistic); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1705; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_logistic, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1705; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1706 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1706 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1706; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_lognormal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1706; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_lognormal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1706; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1707 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1707 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1707; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rayleigh); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1707; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_rayleigh, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1707; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1708 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1708 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1708; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_wald); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1708; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_wald, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1708; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1709 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1709 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1709; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_triangular); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1709; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_triangular, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1709; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1711 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1711 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1712 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1712 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_negative_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_negative_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1713 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1713 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1713; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_poisson); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1713; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_poisson, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1713; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1714 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1714 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1714; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_zipf); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1714; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_zipf, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1714; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1715 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1715 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1715; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_geometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1715; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_geometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1715; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1716 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1716 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1716; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_hypergeometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1716; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_hypergeometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1716; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1717 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1717 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1717; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logseries); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1717; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_logseries, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1717; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1719 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1719 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1719; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multivariate_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1719; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_multivariate_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1719; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1720 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1720 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1720; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multinomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1720; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_multinomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1720; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1721 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1721 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1721; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_dirichlet); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1721; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_dirichlet, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1721; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1723 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1723 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1723; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_shuffle); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1723; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
   if (PyObject_SetAttr(__pyx_m, __pyx_n_shuffle, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1723; goto __pyx_L1;}
   Py_DECREF(__pyx_18); __pyx_18 = 0;
 
-  /* "/home/stefan/work/scipy/numpy.patch/numpy/random/mtrand/mtrand.pyx":1724 */
+  /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1724 */
   __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1724; goto __pyx_L1;}
   __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_permutation); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1724; goto __pyx_L1;}
   Py_DECREF(__pyx_17); __pyx_17 = 0;
@@ -10542,11 +10146,14 @@ static int __Pyx_GetStarArgs(
     PyObject **args, 
     PyObject **kwds,
     char *kwd_list[], 
-    int nargs,
+    Py_ssize_t nargs,
     PyObject **args2, 
-    PyObject **kwds2)
+    PyObject **kwds2,
+    char rqd_kwds[])
 {
     PyObject *x = 0, *args1 = 0, *kwds1 = 0;
+    int i;
+    char **p;
     
     if (args2)
         *args2 = 0;
@@ -10557,25 +10164,37 @@ static int __Pyx_GetStarArgs(
         args1 = PyTuple_GetSlice(*args, 0, nargs);
         if (!args1)
             goto bad;
-        *args2 = PyTuple_GetSlice(*args, nargs, PyTuple_Size(*args));
+        *args2 = PyTuple_GetSlice(*args, nargs, PyTuple_GET_SIZE(*args));
         if (!*args2)
             goto bad;
     }
+    else if (PyTuple_GET_SIZE(*args) > nargs) {
+        int m = nargs;
+        int n = PyTuple_GET_SIZE(*args);
+        PyErr_Format(PyExc_TypeError,
+            "function takes at most %d positional arguments (%d given)",
+                m, n);
+        goto bad;
+    }
     else {
         args1 = *args;
         Py_INCREF(args1);
     }
     
+    if (rqd_kwds && !*kwds)
+            for (i = 0, p = kwd_list; *p; i++, p++)
+                if (rqd_kwds[i])
+                    goto missing_kwarg;
+    
     if (kwds2) {
         if (*kwds) {
-            char **p;
             kwds1 = PyDict_New();
-            if (!kwds)
+            if (!kwds1)
                 goto bad;
             *kwds2 = PyDict_Copy(*kwds);
             if (!*kwds2)
                 goto bad;
-            for (p = kwd_list; *p; p++) {
+            for (i = 0, p = kwd_list; *p; i++, p++) {
                 x = PyDict_GetItemString(*kwds, *p);
                 if (x) {
                     if (PyDict_SetItemString(kwds1, *p, x) < 0)
@@ -10583,6 +10202,8 @@ static int __Pyx_GetStarArgs(
                     if (PyDict_DelItemString(*kwds2, *p) < 0)
                         goto bad;
                 }
+                else if (rqd_kwds && rqd_kwds[i])
+                    goto missing_kwarg;
             }
         }
         else {
@@ -10594,18 +10215,25 @@ static int __Pyx_GetStarArgs(
     else {
         kwds1 = *kwds;
         Py_XINCREF(kwds1);
+        if (rqd_kwds && *kwds)
+            for (i = 0, p = kwd_list; *p; i++, p++)
+                if (rqd_kwds[i] && !PyDict_GetItemString(*kwds, *p))
+                        goto missing_kwarg;
     }
     
     *args = args1;
     *kwds = kwds1;
     return 0;
+missing_kwarg:
+    PyErr_Format(PyExc_TypeError,
+        "required keyword argument '%s' is missing", *p);
 bad:
     Py_XDECREF(args1);
     Py_XDECREF(kwds1);
-    if (*args2) {
+    if (args2) {
         Py_XDECREF(*args2);
     }
-    if (*kwds2) {
+    if (kwds2) {
         Py_XDECREF(*kwds2);
     }
     return -1;
@@ -10671,21 +10299,12 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {
         value = Py_None;
         Py_INCREF(value);
     }
-    /* Next, repeatedly, replace a tuple exception with its first item */
-    while (PyTuple_Check(type) && PyTuple_Size(type) > 0) {
-        PyObject *tmp = type;
-        type = PyTuple_GET_ITEM(type, 0);
-        Py_INCREF(type);
-        Py_DECREF(tmp);
-    }
-    if (PyString_Check(type)) {
-        if (PyErr_Warn(PyExc_DeprecationWarning,
-                "raising a string exception is deprecated"))
-            goto raise_error;
-    }
-    else if (PyType_Check(type) || PyClass_Check(type))
-        ; /*PyErr_NormalizeException(&type, &value, &tb);*/
-    else {
+    #if PY_VERSION_HEX < 0x02050000
+    if (!PyClass_Check(type))
+    #else
+    if (!PyType_Check(type))
+    #endif
+    {
         /* Raising an instance.  The value should be a dummy. */
         if (value != Py_None) {
             PyErr_SetString(PyExc_TypeError,
@@ -10695,11 +10314,25 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {
         /* Normalize to raise <class>, <instance> */
         Py_DECREF(value);
         value = type;
-        if (PyInstance_Check(type))
-            type = (PyObject*) ((PyInstanceObject*)type)->in_class;
-        else
+        #if PY_VERSION_HEX < 0x02050000
+            if (PyInstance_Check(type)) {
+                type = (PyObject*) ((PyInstanceObject*)type)->in_class;
+                Py_INCREF(type);
+            }
+            else {
+                PyErr_SetString(PyExc_TypeError,
+                    "raise: exception must be an old-style class or instance");
+                goto raise_error;
+            }
+        #else
             type = (PyObject*) type->ob_type;
-        Py_INCREF(type);
+            Py_INCREF(type);
+            if (!PyType_IsSubtype((PyTypeObject *)type, (PyTypeObject *)PyExc_BaseException)) {
+                PyErr_SetString(PyExc_TypeError,
+                    "raise: exception class must be a subclass of BaseException");
+                goto raise_error;
+            }
+        #endif
     }
     PyErr_Restore(type, value, tb);
     return;
@@ -10736,34 +10369,27 @@ static int __Pyx_EndUnpack(PyObject *iter) {
         return -1;
 }
 
-static PyObject *__Pyx_GetExcValue(void) {
-    PyObject *type = 0, *value = 0, *tb = 0;
-    PyObject *result = 0;
+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) {
     PyThreadState *tstate = PyThreadState_Get();
-    PyErr_Fetch(&type, &value, &tb);
-    PyErr_NormalizeException(&type, &value, &tb);
+    PyErr_Fetch(type, value, tb);
+    PyErr_NormalizeException(type, value, tb);
     if (PyErr_Occurred())
         goto bad;
-    if (!value) {
-        value = Py_None;
-        Py_INCREF(value);
-    }
+    Py_INCREF(*type);
+    Py_INCREF(*value);
+    Py_INCREF(*tb);
     Py_XDECREF(tstate->exc_type);
     Py_XDECREF(tstate->exc_value);
     Py_XDECREF(tstate->exc_traceback);
-    tstate->exc_type = type;
-    tstate->exc_value = value;
-    tstate->exc_traceback = tb;
-    result = value;
-    Py_XINCREF(result);
-    type = 0;
-    value = 0;
-    tb = 0;
+    tstate->exc_type = *type;
+    tstate->exc_value = *value;
+    tstate->exc_traceback = *tb;
+    return 0;
 bad:
-    Py_XDECREF(type);
-    Py_XDECREF(value);
-    Py_XDECREF(tb);
-    return result;
+    Py_XDECREF(*type);
+    Py_XDECREF(*value);
+    Py_XDECREF(*tb);
+    return -1;
 }
 
 static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
@@ -10798,31 +10424,18 @@ static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {
     return 0;
 }
 
+#ifndef __PYX_HAVE_RT_ImportType
+#define __PYX_HAVE_RT_ImportType
 static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, 
     long size) 
 {
-    PyObject *py_module_name = 0;
-    PyObject *py_class_name = 0;
-    PyObject *py_name_list = 0;
     PyObject *py_module = 0;
     PyObject *result = 0;
     
-    py_module_name = PyString_FromString(module_name);
-    if (!py_module_name)
-        goto bad;
-    py_class_name = PyString_FromString(class_name);
-    if (!py_class_name)
-        goto bad;
-    py_name_list = PyList_New(1);
-    if (!py_name_list)
-        goto bad;
-    Py_INCREF(py_class_name);
-    if (PyList_SetItem(py_name_list, 0, py_class_name) < 0)
-        goto bad;
-    py_module = __Pyx_Import(py_module_name, py_name_list);
+    py_module = __Pyx_ImportModule(module_name);
     if (!py_module)
         goto bad;
-    result = PyObject_GetAttr(py_module, py_class_name);
+    result = PyObject_GetAttrString(py_module, class_name);
     if (!result)
         goto bad;
     if (!PyType_Check(result)) {
@@ -10837,16 +10450,27 @@ static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name,
             module_name, class_name);
         goto bad;
     }
-    goto done;
+    return (PyTypeObject *)result;
 bad:
     Py_XDECREF(result);
-    result = 0;
-done:
-    Py_XDECREF(py_module_name);
-    Py_XDECREF(py_class_name);
-    Py_XDECREF(py_name_list);
-    return (PyTypeObject *)result;
+    return 0;
 }
+#endif
+
+#ifndef __PYX_HAVE_RT_ImportModule
+#define __PYX_HAVE_RT_ImportModule
+static PyObject *__Pyx_ImportModule(char *name) {
+    PyObject *py_name = 0;
+    
+    py_name = PyString_FromString(name);
+    if (!py_name)
+        goto bad;
+    return PyImport_Import(py_name);
+bad:
+    Py_XDECREF(py_name);
+    return 0;
+}
+#endif
 
 #include "compile.h"
 #include "frameobject.h"
diff --git a/numpy/random/mtrand/mtrand.pyx b/numpy/random/mtrand/mtrand.pyx
index f069f11b9..d31b4fd2c 100644
--- a/numpy/random/mtrand/mtrand.pyx
+++ b/numpy/random/mtrand/mtrand.pyx
@@ -1470,7 +1470,7 @@ cdef class RandomState:
         # Create a matrix of independent standard normally distributed random
         # numbers. The matrix has rows with the same length as mean and as
         # many rows are necessary to form a matrix of shape final_shape.
-        x = standard_normal(_sp.multiply.reduce(final_shape))
+        x = self.standard_normal(_sp.multiply.reduce(final_shape))
         x.shape = (_sp.multiply.reduce(final_shape[0:len(final_shape)-1]),
                    mean.shape[0])
         # Transform matrix of standard normals into matrix where each row