astropy/astropy — pull request #258 by iguananaut (2012-06-04 22:56:42+00:00)
Title: Merge branch 'pyfits/astropy' into astropy

This should fix the FITS test that's failing on the numpy-dev builds, as well as a few others that were fixed in PyFITS since the previous merge.

This merges up through r1660 from SVN.

Conflicts:
setup.py

Conflicts:

astropy/io/fits/_release.py
astropy/io/fits/tests/test_image.py