[FFmpeg-cvslog] Merge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 11:13:34 2013 +0200| [dc737f0bfa80c395d265bd4d9e4faf2ba4170bd6] | committer: Michael Niedermayer

Merge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7'

* commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7':
  fate: Add tree test

Conflicts:
	tests/fate/libavutil.mak

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

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