[Numpy-svn] [numpy/numpy] 15b875: Merge branch 'maintenance/1.5.x' of github.com:num...

[noreply at github.com]

Branch: refs/heads/maintenance/1.5.x
Home:   https://github.com/numpy/numpy

Commit: 15b875a0169a0b679a5c966d798d6f2528f63912
    https://github.com/numpy/numpy/commit/15b875a0169a0b679a5c966d798d6f2528f63912
Author: Charles Harris <charlesr.harris at gmail.com>
Date:   2010-11-20 (Sat, 20 Nov 2010)

Changed paths:
  M pavement.py
  M setup.py

Log Message:
-----------
Merge branch 'maintenance/1.5.x' of github.com:numpy/numpy into maintenance/1.5.x


Commit: cc8d5169034f4226e876de5c343efdfa94e89115
    https://github.com/numpy/numpy/commit/cc8d5169034f4226e876de5c343efdfa94e89115
Author: Neil Muller <?@?>
Date:   2010-11-20 (Sat, 20 Nov 2010)

Changed paths:
  M numpy/ctypeslib.py

Log Message:
-----------
BUG: Fix exception handling for python 3k.