Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Apr 2012 22:10:19 +0000 (00:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Apr 2012 22:10:19 +0000 (00:10 +0200)
* qatar/master:
  FATE: Add RALF decoding test

Conflicts:
tests/fate/real.mak

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

Trivial merge