From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Tue, 4 Jun 2013 17:50:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/stable' into dev
X-Git-Tag: upstream/5.2.95+rc1~74
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9785766067aea72da13b1c7821295254d4fabb78;p=platform%2Fupstream%2Fqtmultimedia.git

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

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
---

9785766067aea72da13b1c7821295254d4fabb78