[FFmpeg-cvslog] Merge commit '768e44d044bc32de1e58c198a3708d186af7e966'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  5 10:18:41 2013 +0200| [fbede75a2580ed3561128fcaef206f58be3b010f] | committer: Michael Niedermayer

Merge commit '768e44d044bc32de1e58c198a3708d186af7e966'

* commit '768e44d044bc32de1e58c198a3708d186af7e966':
  build: tune down the output of lcov/gcov

Conflicts:
	tests/Makefile

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

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