[FFmpeg-cvslog] Merge commit '086a541857812b2e0435db38fbabfddc7d19e53c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  5 00:43:06 2014 +0200| [6b646fb9e2cea927a744dabb7c412a13a13d219d] | committer: Michael Niedermayer

Merge commit '086a541857812b2e0435db38fbabfddc7d19e53c'

* commit '086a541857812b2e0435db38fbabfddc7d19e53c':
  fate: png-suite

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b646fb9e2cea927a744dabb7c412a13a13d219d
---