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


Trivial merge