From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Wed, 3 Apr 2013 14:10:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/release' into stable
X-Git-Tag: accepted/tizen/20131212.181521~101^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2230fe7c4a9e97e0f2bb24be19f6408857c9864e;p=platform%2Fupstream%2Fqttools.git

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

Conflicts:
	src/assistant/assistant/assistant.pro

Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0
---

2230fe7c4a9e97e0f2bb24be19f6408857c9864e