[SCM] ffms2/master: Merge tag 'upstream/2.17+r722'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.17+r722
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 838be9a6caffe57dc848d14a6a8d3ffa4c601081
X-Git-Newrev: a18705dad04bbbd3678be30d354811c400988cb1

The following commit has been merged in the master branch:
commit e27c6f7574d1e7b884f3a77656274e5dd4dd3a43
Merge: 838be9a6caffe57dc848d14a6a8d3ffa4c601081 48783dc3d9e35e256b0adcf50c83990ff02298e8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Nov 7 20:05:19 2012 +0100

    Merge tag 'upstream/2.17+r722'
    
    Upstream version 2.17+r722
    
    Conflicts:
    	config.guess
    	config.sub


-- 
ffms2 packaging