[dali_1.0.40] Merge branch 'tizen' 76/38876/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 29 Apr 2015 14:34:48 +0000 (15:34 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 29 Apr 2015 14:34:48 +0000 (15:34 +0100)
Change-Id: Id72a4c7a907ee04179c9ef09efdf84dcc2dc8643


Trivial merge