[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 21 12:07:29 2013 +0100| [8c9df116cd57c6f7dd12f8d6044b7cb048ff3679] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Avoid requiring c99wrap for working around msys path issues

Conflicts:
	configure

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

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