Merge branch 'numpy-1.8' into develop
authorPaul Brossier <piem@piem.org>
Wed, 11 Jul 2012 03:25:25 +0000 (21:25 -0600)
committerPaul Brossier <piem@piem.org>
Wed, 11 Jul 2012 03:25:25 +0000 (21:25 -0600)

Trivial merge