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

Conflicts:
	ANNOUNCE
	CHANGES
This commit is contained in:
Glenn Randers-Pehrson 2011-12-04 19:31:52 -06:00
commit 8fd9c16642

Diff Content Not Available