[FFmpeg-cvslog] Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr  6 13:23:38 2013 +0200| [84bfa8beb708d7594d298b438d3fa9c21630da97] | committer: Michael Niedermayer

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

* commit 'a862c7d3368241e72a465ab944afa38ea62a6640':
  Integrate lcov/gcov into Libav

Conflicts:
	Makefile
	common.mak

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

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