Merge branch 'libpng15' of ssh://www.simplesystems.org/git/libpng into libpng15

Conflicts:
	ANNOUNCE
	CHANGES