From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Wed, 19 Feb 2014 09:04:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/dev' into stable
X-Git-Tag: upstream/5.2.90+alpha~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13882cd5da72bf0f6657752344793103a43a8e41;p=platform%2Fupstream%2Fqtmultimedia.git

Merge remote-tracking branch 'origin/dev' into stable

Change-Id: I84b36fa41f3d5f8fea2dec2545f72ebe6a0c7908
---

13882cd5da72bf0f6657752344793103a43a8e41