[dali_1.1.0] Merge branch 'devel/master' 59/46459/1
authorChu Hoang <c.hoang@samsung.com>
Thu, 20 Aug 2015 12:33:43 +0000 (13:33 +0100)
committerChu Hoang <c.hoang@samsung.com>
Thu, 20 Aug 2015 12:33:43 +0000 (13:33 +0100)
Change-Id: I821720f0a12d9a2597522954afea05f3d8d33f3f


Trivial merge