[dali_1.0.24] Merge branch 'tizen' 67/33367/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 8 Jan 2015 14:44:56 +0000 (14:44 +0000)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 8 Jan 2015 14:53:19 +0000 (14:53 +0000)
Change-Id: I4a9907049a9ba541f1bf9cbf0177755524d02575


Trivial merge