[dali_1.0.24] Merge branch 'tizen' 66/33366/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 8 Jan 2015 14:47:09 +0000 (14:47 +0000)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 8 Jan 2015 14:52:40 +0000 (14:52 +0000)
Change-Id: I497856937c24042fc6e6b4b9c689e0d4c613e7da


Trivial merge