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

[siretart at users.alioth.debian.org]

Imported Upstream version 2.16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 24c1b8de37473c3c5f2d6dbd2063ee19f535ef3e
X-Git-Newrev: 042ce55d7f04b69c65e858dcb82f599847dddd24

The following commit has been merged in the master branch:
commit 8b799db5affd2cbff574a4fa164ba2c8a0d16cb9
Merge: 24c1b8de37473c3c5f2d6dbd2063ee19f535ef3e 4a4e36ed6e7812dd140c3b2e64dbcf62a5b7d544
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Sep 1 23:30:39 2011 +0200

    Merge commit 'upstream/2.16'
    
    Conflicts:
    	aclocal.m4
    	m4/ltoptions.m4
    	m4/lt~obsolete.m4


-- 
ffms2 packaging