Merge the changes for ticket 219.

Conflicts:

	setup.cfg

git-svn-id: http://svn6.assembla.com/svn/pyfits/branches/3.0-stable@2156 ed100bfc-0583-0410-97f2-c26b58777a21