Merge branch 'png_faster'

Conflicts:
	autogen.sh
	configure.ac
	src/tracker-extract/Makefile.am