[dali_1.1.0] Merge branch 'devel/master' 58/46458/1
authorChu Hoang <c.hoang@samsung.com>
Thu, 20 Aug 2015 12:33:34 +0000 (13:33 +0100)
committerChu Hoang <c.hoang@samsung.com>
Thu, 20 Aug 2015 12:33:34 +0000 (13:33 +0100)
Change-Id: Ifa2184143e98ea9a4e5c86bcc37138b5c246181a


Trivial merge