[dali_1.0.46] Merge branch 'devel/master' 40/42240/1
authorChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:55:07 +0000 (15:55 +0100)
committerChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:55:07 +0000 (15:55 +0100)
Change-Id: I84b588ac741620f9c1796a1c68016ffafaf88fc8


Trivial merge