[SCM] ffmpeg/master: Merge branch 'upstream'

[siretart at users.alioth.debian.org]

Imported Upstream version 0.7~beta2
Merge remote branch 'origin/upstream' into upstream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 69ae71a09af49ae0074a629d63d80559388c3912
X-Git-Newrev: 902ea947130027793d9db1a43ca30b8f7d3ccb3d

The following commit has been merged in the master branch:
commit 895282f84073577c6f6765877278ce9dba1a5ae3
Merge: 69ae71a09af49ae0074a629d63d80559388c3912 c15fbb95ae00ea98d055e9750ac3e9ab406ff916
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 13 12:27:41 2011 +0200

    Merge branch 'upstream'


-- 
Libav/FFmpeg packaging