[SCM] libav/experimental: Merge remote-tracking branch 'origin/experimental' into experimental

[siretart at users.alioth.debian.org]

update upstream branch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental
X-Git-Reftype: branch
X-Git-Oldrev: bcc42be5c0bba8a70217e2511d350e61a40c31ae
X-Git-Newrev: 52e06ca15770a3ee0418c547c392af30af6f13b1

The following commit has been merged in the experimental branch:
commit 52e06ca15770a3ee0418c547c392af30af6f13b1
Merge: c007156c6843c0f28e217f15bf78a16bd2cabaa4 bcc42be5c0bba8a70217e2511d350e61a40c31ae
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 1 18:03:17 2012 +0200

    Merge remote-tracking branch 'origin/experimental' into experimental
    
    Conflicts:
    	debian/gbp.conf


-- 
Libav/FFmpeg packaging