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

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

Imported Upstream version 2.0.0~rc1+debian
Imported Upstream version 2.0.0~rc1+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: 5b9d13746222efc480a2068a7441c35928c7741c
X-Git-Newrev: af681fd3dd77d43cc795fbe28a04df0007e037db

The following commit has been merged in the master branch:
commit af681fd3dd77d43cc795fbe28a04df0007e037db
Merge: 5b9d13746222efc480a2068a7441c35928c7741c cc051ccc2b3d4f66fcba982e0ebaff0eaf519043
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Sun May 1 00:41:07 2011 +0700

    Merge commit 'upstream/2.0.0_rc1+debian'


-- 
mjpegtools packaging