astropy/astropy — pull request #289 by iguananaut (2012-06-15 23:23:38+00:00)
Title: Merge branch 'pyfits/astropy' into astropy

This is the latest merge from PyFITS' trunk.