From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Fri, 22 Mar 2013 15:27:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/dev' into stable
X-Git-Tag: upstream/5.2.1~812^2~5^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ac2ce5f4810092cd2135663160017e81d6c96a4;p=platform%2Fupstream%2Fqtdeclarative.git

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

These two patches should have targeted 5.1 and went in just
at the wrong time.

Change-Id: Idd0a7a812fb11e2aea2c187d5e82aa31494c576c
---

5ac2ce5f4810092cd2135663160017e81d6c96a4