[dali_1.0.46] Merge branch 'devel/master' 38/42238/1
authorChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:54:53 +0000 (15:54 +0100)
committerChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:54:53 +0000 (15:54 +0100)
Change-Id: Ibaeb4162395c0f3c4e9f62ede4cdec5af82cc4c4


Trivial merge