Merge branch 'eldruin_ffmpeg2'
authorCarlos Lopez <genetita@gmail.com>
Fri, 12 Mar 2010 17:07:14 +0000 (18:07 +0100)
committerCarlos Lopez <genetita@gmail.com>
Fri, 12 Mar 2010 17:07:14 +0000 (18:07 +0100)

Trivial merge