From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 17 Jul 2015 08:26:12 +0000 (+0100)
Subject: [dali_1.0.49] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~238
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c2c26bbf1ab67ccf1a74c920ab1189cf24255daf

[dali_1.0.49] Merge branch 'devel/master'

Change-Id: Ibce51e43c0f557cc08c63c943ab81e27b1b3664d
---

c2c26bbf1ab67ccf1a74c920ab1189cf24255daf