[SCM] cinelerra-cv/master: Merge commit 'upstream/2.1.5_dfsg1'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.1.5~dfsg1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cba84956b12adb8737d412087cdb6c4846ce0f97
X-Git-Newrev: 0c1a39dee1fe0603053f727e7ef31e08ad6e45c7

The following commit has been merged in the master branch:
commit 0c1a39dee1fe0603053f727e7ef31e08ad6e45c7
Merge: 49d1ad48674409ff3cc7cb359c5cab544a78ec31 89d867d4cab88de3da298cd2e6570f64fd05cc7a
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 20 09:39:45 2011 +0200

    Merge commit 'upstream/2.1.5_dfsg1'


-- 
cinelerra-cv packaging