From: Lee Morgan <Lee.morgan@partner.samsung.com>
Date: Thu, 9 Jul 2015 14:12:53 +0000 (+0100)
Subject: [dali_1.0.48] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~239
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=801f24237cb266e175386f62231663a47196661a

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

Change-Id: Iacf65d1342ad030464356fbe8d0a72865b4a72a5
---

801f24237cb266e175386f62231663a47196661a