From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Wed, 9 Nov 2011 15:21:13 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bae96d4b906092465a7624195a55b6527529cd7c;p=kdenlive

Merge branch 'master' into next
---

bae96d4b906092465a7624195a55b6527529cd7c