[FFmpeg-cvslog] Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  5 10:36:23 2013 +0200| [336ffb837705810682423b4d411c20170e56b923] | committer: Michael Niedermayer

Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'

* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07':
  build: normalize coverage.info

Conflicts:
	tests/Makefile

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

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