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

[siretart at users.alioth.debian.org]

Imported Upstream version 0.6.2
Imported Upstream version 0.6.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: aad52940050693538757a8dd84957840d92f28ec
X-Git-Newrev: 6ab7c070598b639e800f766bb11c5d0ad436d96a

The following commit has been merged in the upstream branch:
commit 6ab7c070598b639e800f766bb11c5d0ad436d96a
Merge: 0ed2efd3a7a7a0aa314126f5c06d0757be3edb54 aad52940050693538757a8dd84957840d92f28ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 15:01:34 2011 +0200

    Merge remote branch 'origin/upstream' into upstream
    
    fake merge with no changes.
    
    I forgot to update my local 'upstream' branch.


-- 
Libav/FFmpeg packaging