From: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Date: Tue, 10 Feb 2015 09:34:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/5.4.1' into 5.4
X-Git-Tag: v5.5.90+alpha1~32^2^2~2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e936128904625613e0e73fbbd8fc6a48c10e0bd;p=platform%2Fupstream%2Fqtmultimedia.git

Merge remote-tracking branch 'origin/5.4.1' into 5.4

Change-Id: I4167d268505cbc0b7b57888928670ae05302f4cb
---

9e936128904625613e0e73fbbd8fc6a48c10e0bd