Merge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 May 2013 19:36:48 +0000 (21:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 May 2013 19:38:17 +0000 (21:38 +0200)
* commit '9495cd170b5786c3518419e873d94eb5e7ada11a':
  configure: Fix check_exec_crash for ICL support

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
Simple merge