[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.6' into release/0.6

[Michael Niedermayer]

ffmpeg | branch: release/0.6 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr  2 02:19:06 2012 +0200| [113ca1b8db8f4b76568e40cadfd314d6ab64623c] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.6' into release/0.6

* qatar/release/0.6:
  id3v2: fix skipping extended header in id3v2.4

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

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