[dali_1.0.24] Merge branch 'tizen' 65/33365/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 8 Jan 2015 14:49:13 +0000 (14:49 +0000)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Thu, 8 Jan 2015 14:51:50 +0000 (14:51 +0000)
Change-Id: I46cfec98a7857b2a387412204dd226c21501cb9a


Trivial merge