From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Thu, 10 Nov 2011 00:51:53 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d428e8bbbc881f61872743893518f568401df958;p=kdenlive

Merge branch 'master' into next
---

d428e8bbbc881f61872743893518f568401df958