[FFmpeg-cvslog] Merge commit '543156d7518f5e5d731123da066d86278f9fa492'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 19 14:01:25 2014 +0100| [53d11f7b2d380c19ae862331d7283039b49c9f0e] | committer: Michael Niedermayer

Merge commit '543156d7518f5e5d731123da066d86278f9fa492'

* commit '543156d7518f5e5d731123da066d86278f9fa492':
  arm: Mark the stack as non-executable

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

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