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

Merge branch 'master' into next
---

62f2a2190b0c910c1d920834f1eabfb997544680