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

[siretart at users.alioth.debian.org]

Imported Upstream version 2.17
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 20def3ecd2022932b9a8be36208ce2bc4d441c6e
X-Git-Newrev: a491acfb84b938defb2cfafd735f951d3f61dfa6

The following commit has been merged in the master branch:
commit a491acfb84b938defb2cfafd735f951d3f61dfa6
Merge: c4d1e38fbce863885c2e68455a5c12693af8e52c 2da154392c746ce9064f9e37dc4ef1cfd3d9b209
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 23 10:19:19 2012 +0100

    Merge commit 'upstream/2.17'
    
    Conflicts:
    	config.guess
    	config.sub


-- 
ffms2 packaging