[FFmpeg-cvslog] Merge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 25 21:36:48 2013 +0200| [efcc334c9d419d3b05612f321730b6d13a697b96] | committer: Michael Niedermayer

Merge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'

* commit '9495cd170b5786c3518419e873d94eb5e7ada11a':
  configure: Fix check_exec_crash for ICL support

Conflicts:
	configure

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

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