[SCM] mjpegtools/master: Merge tag 'upstream/2.0.0+debian'

[siretart at users.alioth.debian.org]

Imported Upstream version 2.0.0+debian
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 328fb3dfc035123b53ec7ea51c10b76c3c826c1e
X-Git-Newrev: 8101aec11ad75f0107453bd9e181597b09217b15

The following commit has been merged in the master branch:
commit f81d2978d29f77790b02c012460cca2f6cdd70d3
Merge: 46e08f604f977017ab5b3e9a6176dff3b1a8c683 2ab083dcc321b12aa30ea0156baa61241eb308a6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 2 14:52:23 2012 +0200

    Merge tag 'upstream/2.0.0+debian'
    
    Upstream version 2.0.0+debian


-- 
mjpegtools packaging