Fixed regular expression for Python 2.6
Conflicts:
	astropy/tests/pytest_plugins.py
Fix bug in Numpy <= 1.7 where unicode fill values on masked arrays are
not supported.
Add CHANGES entry.
Fix egg_info
Merge branch 'misc/fix-numpy-ma-unicode-fill-value' into testing/py26-regex-fix