[FFmpeg-cvslog] Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 13 13:42:10 2013 +0100| [841a288cb32785400261cbab959fcfb982d3f699] | committer: Michael Niedermayer

Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'

* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
  fate: cosmetics: Order some test entries

Conflicts:
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak

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

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