From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 16 Jan 2015 17:05:00 +0000 (+0100)
Subject: Merge 5.4 into 5.4.1
X-Git-Tag: v5.4.1^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8efb8f55d9ef0f1cfbbf6c50a71a3aada017f78;p=platform%2Fupstream%2Fqttools.git

Merge 5.4 into 5.4.1

Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a
---

e8efb8f55d9ef0f1cfbbf6c50a71a3aada017f78