[SCM] ffms2/master: Merge commit 'upstream/2.15+svn473'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.15+svn473
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1954740668b1247b333be97d6b83761e17ac9d54
X-Git-Newrev: 64ec3e75133346db9eba40361e3b0f78f6ebe437

The following commit has been merged in the master branch:
commit 4bedf41f2f961ef92aa199d29c0cd4d38beafb17
Merge: 1954740668b1247b333be97d6b83761e17ac9d54 c63b1c6908d4544fc72bd41dc5135f15ad028396
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 19 11:12:53 2011 +0200

    Merge commit 'upstream/2.15+svn473'


-- 
ffms2 packaging