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


Trivial merge