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


Trivial merge