[SCM] ffmpeg/master.snapshot: Merge commit 'upstream/0.6.1' into master.snapshot

[siretart at users.alioth.debian.org]

Imported Upstream version 0.6.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.snapshot
X-Git-Reftype: branch
X-Git-Oldrev: 59bb4dc101b4cec3c2210d7a4a628af709e8399f
X-Git-Newrev: 983ce436bc1e5559876013a55d7ed01ffa48d060

The following commit has been merged in the master.snapshot branch:
commit 424aee133221de0051f7a6d882af8097a42aa719
Merge: e44dcaf290feeefc55e49a433cf9ef45aa2ddf71 e87738170b535dc8713108c0c38cbec741218f34
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 1 09:13:16 2010 +0100

    Merge commit 'upstream/0.6.1' into master.snapshot


-- 
FFmpeg packaging