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

[ricotz-guest at users.alioth.debian.org]

Imported Upstream version 2.15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 557ce9d1523f81deff9bc2628c06bc08bffc0e02
X-Git-Newrev: 395651ef5a9540adc0bcfe3cc46a482461061477

The following commit has been merged in the master branch:
commit c9570143988b596507025d7649b1a54eb380e510
Merge: 557ce9d1523f81deff9bc2628c06bc08bffc0e02 46a7145b25fff29dc46a393e99f0fea3f50a0245
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Fri Feb 18 08:59:39 2011 +0100

    Merge commit 'upstream/2.15'


-- 
ffms2 packaging