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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.1.5~dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7422b26d01da454c2ae970e6b6bf5bd6e6ca3051
X-Git-Newrev: 831b15522f7ac56e84bc8f533cea9ffbad8bfaf7

The following commit has been merged in the master branch:
commit b06d9c332d325bf479ebaf5b568dfc6092bd5363
Merge: 7422b26d01da454c2ae970e6b6bf5bd6e6ca3051 863b2ac5b7ca881860cf353a70c5db1768371834
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 26 16:52:57 2011 +0200

    Merge commit 'upstream/2.1.5_dfsg0'


-- 
cinelerra-cv packaging