[SCM] ffmpeg/ubuntu: Merge remote-tracking branch 'origin/upstream' into ubuntu

[siretart at users.alioth.debian.org]

Merge remote branch 'origin/upstream' into upstream
Imported Upstream version 4:0.7~b1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: bd2815f59fff8d77a4f9db0f8930371cca07bd51
X-Git-Newrev: 9467e814bd64404cafb6646dac5e991cd2a43529

The following commit has been merged in the ubuntu branch:
commit f0b9818e6da91f217086dbb465d852a5fa9de909
Merge: bd2815f59fff8d77a4f9db0f8930371cca07bd51 6ab7c070598b639e800f766bb11c5d0ad436d96a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Apr 30 12:06:06 2011 +0200

    Merge remote-tracking branch 'origin/upstream' into ubuntu


-- 
Libav/FFmpeg packaging