[FFmpeg-cvslog] Merge commit '06688e96fb9577bc7466a380bf7a14fa745208db'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  1 03:23:36 2014 +0200| [42138f63574b77d5bccc22e711261cb6c82ed352] | committer: Michael Niedermayer

Merge commit '06688e96fb9577bc7466a380bf7a14fa745208db'

* commit '06688e96fb9577bc7466a380bf7a14fa745208db':
  fate: add exr tests

Conflicts:
	tests/fate/image.mak

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

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